提交 75bbf6e1 编写于 作者: A Andy Polyakov

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

PR: 1753
Submitted by: Alon Bar-Lev
上级 702e7425
...@@ -1432,12 +1432,13 @@ while (<IN>) ...@@ -1432,12 +1432,13 @@ while (<IN>)
s/^AR=\s*/AR= \$\(CROSS_COMPILE_PREFIX\)/; s/^AR=\s*/AR= \$\(CROSS_COMPILE_PREFIX\)/;
s/^NM=\s*/NM= \$\(CROSS_COMPILE_PREFIX\)/; s/^NM=\s*/NM= \$\(CROSS_COMPILE_PREFIX\)/;
s/^RANLIB=\s*/RANLIB= \$\(CROSS_COMPILE_PREFIX\)/; s/^RANLIB=\s*/RANLIB= \$\(CROSS_COMPILE_PREFIX\)/;
s/^MAKEDEPPROG=.*$/MAKEDEPPROG= \$\(CROSS_COMPILE_PREFIX\)$cc/ if $cc eq "gcc";
} }
else { else {
s/^CC=.*$/CC= $cc/; s/^CC=.*$/CC= $cc/;
s/^RANLIB=.*/RANLIB= $ranlib/; s/^RANLIB=.*/RANLIB= $ranlib/;
s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc eq "gcc";
} }
s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc eq "gcc";
s/^CFLAG=.*$/CFLAG= $cflags/; s/^CFLAG=.*$/CFLAG= $cflags/;
s/^DEPFLAG=.*$/DEPFLAG=$depflags/; s/^DEPFLAG=.*$/DEPFLAG=$depflags/;
s/^PEX_LIBS=.*$/PEX_LIBS= $prelflags/; s/^PEX_LIBS=.*$/PEX_LIBS= $prelflags/;
......
...@@ -14,7 +14,7 @@ if [ "$MAKEDEPEND" = "" ]; then MAKEDEPEND=makedepend; fi ...@@ -14,7 +14,7 @@ if [ "$MAKEDEPEND" = "" ]; then MAKEDEPEND=makedepend; fi
cp Makefile Makefile.save cp Makefile Makefile.save
# fake the presence of Kerberos # fake the presence of Kerberos
touch $TOP/krb5.h touch $TOP/krb5.h
if [ "$MAKEDEPEND" = "gcc" ]; then if expr "$MAKEDEPEND" : '.*gcc$' > /dev/null; then
args="" args=""
while [ $# -gt 0 ]; do while [ $# -gt 0 ]; do
if [ "$1" != "--" ]; then args="$args $1"; fi if [ "$1" != "--" ]; then args="$args $1"; fi
...@@ -22,7 +22,7 @@ if [ "$MAKEDEPEND" = "gcc" ]; then ...@@ -22,7 +22,7 @@ if [ "$MAKEDEPEND" = "gcc" ]; then
done done
sed -e '/^# DO NOT DELETE.*/,$d' < Makefile > Makefile.tmp sed -e '/^# DO NOT DELETE.*/,$d' < Makefile > Makefile.tmp
echo '# DO NOT DELETE THIS LINE -- make depend depends on it.' >> 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 ${PERL} $TOP/util/clean-depend.pl < Makefile.tmp > Makefile.new
rm -f Makefile.tmp rm -f Makefile.tmp
else else
......
...@@ -51,6 +51,7 @@ my $to = join('/', @to_path); ...@@ -51,6 +51,7 @@ my $to = join('/', @to_path);
my $file; my $file;
$symlink_exists=eval {symlink("",""); 1}; $symlink_exists=eval {symlink("",""); 1};
if ($^O eq "msys") { $symlink_exists=0 };
foreach $file (@files) { foreach $file (@files) {
my $err = ""; my $err = "";
if ($symlink_exists) { if ($symlink_exists) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册