mirror of
https://github.com/QuasarApp/openssl.git
synced 2025-05-16 11:29:42 +00:00
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.
This commit is contained in:
parent
84be7091fd
commit
a34922c476
@ -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
|
||||
|
@ -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)
|
||||
|
Loading…
x
Reference in New Issue
Block a user