From: Dr. Stephen Henson <steve@openssl.org>
Date: Sat, 15 Feb 2014 20:16:13 +0000 (+0000)
Subject: Don't override $srcd for non copy builds.
X-Git-Tag: OpenSSL_1_0_2-beta1~16
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=71eca86c304806c8f6e825705c40f0a2a417cb19;p=oweals%2Fopenssl.git

Don't override $srcd for non copy builds.
---

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 0f23854c44..72ae0fddae 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -1073,11 +1073,11 @@ sub cc_compile_target
 	$ex_flags.=" -DMK1MF_BUILD -D$platform_cpp_symbol" if ($source =~ /cversion/);
 	$target =~ s/\//$o/g if $o ne "/";
 	$source =~ s/\//$o/g if $o ne "/";
-	$srcd = "\$(SRC_D)$o" unless defined $srcd;
+	$srcd = "\$(SRC_D)$o" unless defined $srcd && $platform ne 'copy';
 	$ret ="$target: $srcd$source\n\t";
 	$ret.="\$(CC)";
 	$ret.= " -MMD" if $orig_platform eq "copy";
-	$ret.= " ${ofile}$target $ex_flags -c \$(SRC_D)$o$source\n\n";
+	$ret.= " ${ofile}$target $ex_flags -c $srcd$source\n\n";
 	$target =~ s/\.o$/.d/;
 	$ret.=".sinclude \"$target\"\n\n" if $orig_platform eq "copy";
 	return($ret);