From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 21 Jan 2009 21:44:52 +0000 (+0000)
Subject: PR: 1806
X-Git-Tag: OpenSSL_0_9_8k~52
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a34922c47639a201dfa759faff51a4a6be59408a;p=oweals%2Fopenssl.git

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.
---

diff --git a/util/domd b/util/domd
index 691be7a440..560ebeaf82 100755
--- a/util/domd
+++ b/util/domd
@@ -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)