Commit 1b3af972 authored by Todd Short's avatar Todd Short Committed by Andy Polyakov
Browse files

Configure: fix Mac OS X builds that still require makedepend 



Earlier Apple Xcode compilers, e.g. one targeting Mac OS X 10.7, don't
support dependency generation and one still has to use makedepend.  It's
unclear when it was fixed, but all clang-based Apple compilers seem to
support -M options.

Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6073)
parent bd05644d

Configure

+9 −2
Original line number Diff line number Diff line
@@ -1671,6 +1671,13 @@ while (<PIPE>) { 
}

close(PIPE);



# Xcode did not handle $cc -M before clang support

my $cc_as_makedepend = 0;

if ($predefined{__GNUC__} >= 3 && !(defined($predefined{__APPLE_CC__})

                                    && !defined($predefined{__clang__}))) {

  $cc_as_makedepend = 1;

}



if ($strict_warnings)

	{

	my $wopt;
@@ -1730,14 +1737,14 @@ while (<IN>) 
		s/^NM=\s*/NM= \$\(CROSS_COMPILE\)/;

		s/^RANLIB=\s*/RANLIB= \$\(CROSS_COMPILE\)/;

		s/^RC=\s*/RC= \$\(CROSS_COMPILE\)/;

		s/^MAKEDEPPROG=.*$/MAKEDEPPROG= \$\(CROSS_COMPILE\)$cc/ if $predefined{__GNUC__} >= 3;

		s/^MAKEDEPPROG=.*$/MAKEDEPPROG= \$\(CROSS_COMPILE\)$cc/ if $cc_as_makedepend;

		}

	else	{

		s/^CC=.*$/CC= $cc/;

		s/^AR=\s*ar/AR= $ar/;

		s/^RANLIB=.*/RANLIB= $ranlib/;

		s/^RC=.*/RC= $windres/;

		s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $predefined{__GNUC__} >= 3;

		s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc_as_makedepend;

		}

	s/^CFLAG=.*$/CFLAG= $cflags/;

	s/^DEPFLAG=.*$/DEPFLAG=$depflags/;