Upstream tarball 2.2.9upstream/2.2.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;