Commit 75bbf6e1 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

make depend to work with cross-gcc, compensate for msys glitch. 

PR: 1753
Submitted by: Alon Bar-Lev
parent 702e7425

Configure

+2 −1
Original line number Diff line number Diff line
@@ -1432,12 +1432,13 @@ while (<IN>) 
		s/^AR=\s*/AR= \$\(CROSS_COMPILE_PREFIX\)/;

		s/^NM=\s*/NM= \$\(CROSS_COMPILE_PREFIX\)/;

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

		s/^MAKEDEPPROG=.*$/MAKEDEPPROG= \$\(CROSS_COMPILE_PREFIX\)$cc/ if $cc eq "gcc";

		}

	else	{

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

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

		}

		s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc eq "gcc";

		}

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

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

	s/^PEX_LIBS=.*$/PEX_LIBS= $prelflags/;

util/domd

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ if [ "$MAKEDEPEND" = "" ]; then MAKEDEPEND=makedepend; fi 
cp Makefile Makefile.save

# fake the presence of Kerberos

touch $TOP/krb5.h

if [ "$MAKEDEPEND" = "gcc" ]; then

if expr "$MAKEDEPEND" : '.*gcc$' > /dev/null; then

    args=""

    while [ $# -gt 0 ]; do

	if [ "$1" != "--" ]; then args="$args $1"; fi
@@ -22,7 +22,7 @@ if [ "$MAKEDEPEND" = "gcc" ]; then 
    done

    sed -e '/^# DO NOT DELETE.*/,$d' < Makefile > Makefile.tmp

    echo '# DO NOT DELETE THIS LINE -- make depend depends on it.' >> Makefile.tmp

    gcc -Werror -D OPENSSL_DOING_MAKEDEPEND -M $args >> Makefile.tmp || exit

    ${MAKEDEPEND} -Werror -D OPENSSL_DOING_MAKEDEPEND -M $args >> Makefile.tmp || exit

    ${PERL} $TOP/util/clean-depend.pl < Makefile.tmp > Makefile.new

    rm -f Makefile.tmp

else

util/mklink.pl

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ my $to = join('/', @to_path); 


my $file;

$symlink_exists=eval {symlink("",""); 1};

if ($^O eq "msys") { $symlink_exists=0 };

foreach $file (@files) {

    my $err = "";

    if ($symlink_exists) {