Commit 717f308e 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 avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6169)
parent 41d6e0f3

Configure

+4 −2
Original line number Diff line number Diff line
@@ -1415,9 +1415,11 @@ if (!$disabled{makedepend}) { 
        # For VC- and vms- targets, there's nothing more to do here.  The

        # functionality is hard coded in the corresponding build files for

        # cl (Windows) and CC/DECC (VMS).

    } elsif ($predefined{__GNUC__} >= 3) {

    } elsif (($predefined{__GNUC__} // -1) >= 3

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

        # We know that GNU C version 3 and up as well as all clang

        # versions support dependency generation

        # versions support dependency generation, but Xcode did not

        # handle $cc -M before clang support (but claims __GNUC__ = 3)

        $config{makedepprog} = "\$(CROSS_COMPILE)$config{CC}";

    } else {

        # In all other cases, we look for 'makedepend', and disable the