Don't override $srcd for non copy builds.
authorDr. Stephen Henson <steve@openssl.org>
Sat, 15 Feb 2014 20:16:13 +0000 (20:16 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Sat, 15 Feb 2014 20:16:13 +0000 (20:16 +0000)
util/mk1mf.pl

index 0f23854..72ae0fd 100755 (executable)
@@ -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);