diff options
author | Andy Polyakov <appro@openssl.org> | 2008-12-19 13:35:09 +0000 |
---|---|---|
committer | Andy Polyakov <appro@openssl.org> | 2008-12-19 13:35:09 +0000 |
commit | 75bbf6e14c14583a7fd3c1ca03888d4eb5568d4f (patch) | |
tree | 5558c86fc14f05000733694b8ebe05b7f78eefe4 /util | |
parent | 702e7425150a2dcee7308af034984d21edb717f5 (diff) | |
download | openssl-75bbf6e14c14583a7fd3c1ca03888d4eb5568d4f.tar.gz |
make depend to work with cross-gcc, compensate for msys glitch.
PR: 1753
Submitted by: Alon Bar-Lev
Diffstat (limited to 'util')
-rwxr-xr-x | util/domd | 4 | ||||
-rwxr-xr-x | util/mklink.pl | 1 |
2 files changed, 3 insertions, 2 deletions
@@ -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 diff --git a/util/mklink.pl b/util/mklink.pl index d9bc98aab8..61db12c68f 100755 --- a/util/mklink.pl +++ b/util/mklink.pl @@ -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) { |