diff options
author | Stefan Fritsch <sf@sfritsch.de> | 2011-12-27 19:42:22 +0100 |
---|---|---|
committer | Stefan Fritsch <sf@sfritsch.de> | 2011-12-27 19:42:22 +0100 |
commit | 0268977037115539ad65a26e858aa0df8d18cd13 (patch) | |
tree | f761b541b04d08b75e32efc6c293111c61a8b79c /srclib/apr/build/fixwin32mak.pl | |
parent | 9e615cb6aa4afcee97f8a1646e5a586261a7b81f (diff) | |
download | apache2-0268977037115539ad65a26e858aa0df8d18cd13.tar.gz |
Upstream tarball 2.2.9upstream/2.2.9
Diffstat (limited to 'srclib/apr/build/fixwin32mak.pl')
-rw-r--r-- | srclib/apr/build/fixwin32mak.pl | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/srclib/apr/build/fixwin32mak.pl b/srclib/apr/build/fixwin32mak.pl index 2c7b7d2a..b559eecc 100644 --- a/srclib/apr/build/fixwin32mak.pl +++ b/srclib/apr/build/fixwin32mak.pl @@ -86,6 +86,15 @@ sub fixcwd { $verchg = -1; undef $orig; } + # With modern LINK.EXE linkers, there is a different LINK for + # each platform, and it's determined by the file path. Best + # that here, after we compiled the code to the default CPU, + # that we also link here to the default CPU. Omitting the + # /machine spec from the .dsp was not enough, MSVC put it back. + # + if ($src =~ s#^(LINK32_FLAGS=.*) /machine:(x|IX|I3)86 #$1 #) { + $verchg = -1; + } print $dstfl $src; } undef $srcfl; |