generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PR: 1806

Browse Source 
Submitted by: philipp_subx@redfish-solutions.com
Approved by: steve

Use ${CC:-gcc} instead of just gcc in domd, to support cross compilation.
This commit is contained in:
Dr. Stephen Henson 2009-01-21 21:44:52 +00:00
parent 84be7091fd
commit a34922c476
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
util/domd
View File

@ -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 -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 ${PERL} $TOP/util/clean-depend.pl < Makefile.tmp > Makefile.new
rm -f Makefile.tmp rm -f Makefile.tmp
else else

2
util/pl/VC-32.pl
View File

@ -405,7 +405,7 @@ sub do_link_rule
if ($standalone == 1) if ($standalone == 1)
{ {
$ret.=" \$(LINK) \$(LFLAGS) $efile$target @<<\n\t"; $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"; $ret.="$files $libs\n<<\n";
} }
elsif ($standalone == 2) elsif ($standalone == 2)