Commit a34922c4 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

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.
parent 84be7091

util/domd

+1 −1
Original line number Diff line number Diff line
@@ -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

util/pl/VC-32.pl

+1 −1
Original line number Diff line number Diff line
@@ -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)