diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2009-01-21 21:44:52 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2009-01-21 21:44:52 +0000 |
| commit | a34922c47639a201dfa759faff51a4a6be59408a (patch) | |
| tree | 65cffde43fde966e2a26c7cc5312834e606406a9 /util | |
| parent | 84be7091fd586b634a5cc62008d00579320fb347 (diff) | |
PR: 1806
Submitted by: philipp_subx@redfish-solutions.com
Approved by: steve
Use ${CC:-gcc} instead of just gcc in domd, to support cross compilation.
Diffstat (limited to 'util')
| -rwxr-xr-x | util/domd | 2 | ||||
| -rw-r--r-- | util/pl/VC-32.pl | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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 -D OPENSSL_DOING_MAKEDEPEND -M $args >> Makefile.tmp + ${CC:-gcc} -D OPENSSL_DOING_MAKEDEPEND -M $args >> Makefile.tmp ${PERL} $TOP/util/clean-depend.pl < Makefile.tmp > Makefile.new rm -f Makefile.tmp else diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl index 730c2083bd..f5d0a04cfe 100644 --- a/util/pl/VC-32.pl +++ b/util/pl/VC-32.pl @@ -405,7 +405,7 @@ sub do_link_rule if ($standalone == 1) { $ret.=" \$(LINK) \$(LFLAGS) $efile$target @<<\n\t"; - $ret.= "$mwex advapi32.lib " if ($files =~ /O_FIPSCANISTER/ && !$fipscanisterbuild); + $ret.= "\$(EX_LIBS) " if ($files =~ /O_FIPSCANISTER/ && !$fipscanisterbuild); $ret.="$files $libs\n<<\n"; } elsif ($standalone == 2) |