diff --git a/Configure b/Configure index c7066dc97c..01d07074de 100755 --- a/Configure +++ b/Configure @@ -1672,13 +1672,6 @@ while () { } 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; @@ -1738,14 +1731,14 @@ while () 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 $cc_as_makedepend; + s/^MAKEDEPPROG=.*$/MAKEDEPPROG= \$\(CROSS_COMPILE\)$cc/ if $predefined{__GNUC__} >= 3; } else { s/^CC=.*$/CC= $cc/; s/^AR=\s*ar/AR= $ar/; s/^RANLIB=.*/RANLIB= $ranlib/; s/^RC=.*/RC= $windres/; - s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc_as_makedepend; + s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $predefined{__GNUC__} >= 3; } s/^CFLAG=.*$/CFLAG= $cflags/; s/^DEPFLAG=.*$/DEPFLAG=$depflags/;