apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r573688 - /apr/apr/trunk/build/fixwin32mak.pl
Date Fri, 07 Sep 2007 20:12:50 GMT
Author: wrowe
Date: Fri Sep  7 13:12:49 2007
New Revision: 573688

URL: http://svn.apache.org/viewvc?rev=573688&view=rev
Log:
Strip out the /machine from link.exe, in this day and age each CPU
gets it's own link.exe in it's own path, e.g. you need to set up the
path for amd64 and you will get that cl compiler, and that linker.
Although I had already stripped /machine from the .pdb's, the silly
export put one back.  Axe it for good when touching up our .mak files.

Modified:
    apr/apr/trunk/build/fixwin32mak.pl

Modified: apr/apr/trunk/build/fixwin32mak.pl
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/fixwin32mak.pl?rev=573688&r1=573687&r2=573688&view=diff
==============================================================================
--- apr/apr/trunk/build/fixwin32mak.pl (original)
+++ apr/apr/trunk/build/fixwin32mak.pl Fri Sep  7 13:12:49 2007
@@ -86,6 +86,15 @@
                 $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;



Mime
View raw message