[Windows] Correct run-path when using 64-bit binaries.
authorbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 4 Oct 2013 23:58:37 +0000 (23:58 +0000)
committerbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 4 Oct 2013 23:58:37 +0000 (23:58 +0000)
Reviewed by David Kilzer.

* Scripts/webkitdirs.pm:
(determineConfigurationProductDir): If running in 64-bit mode, use the 'bin64'
directory. Otherwise use the existing 'bin32' directory.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@156928 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/Scripts/webkitdirs.pm

index d8a1bc4..40a67c6 100644 (file)
@@ -1,5 +1,15 @@
 2013-10-04  Brent Fulgham  <bfulgham@apple.com>
 
+        [Windows] Correct run-path when using 64-bit binaries.
+
+        Reviewed by David Kilzer.
+
+        * Scripts/webkitdirs.pm:
+        (determineConfigurationProductDir): If running in 64-bit mode, use the 'bin64'
+        directory. Otherwise use the existing 'bin32' directory.
+
+2013-10-04  Brent Fulgham  <bfulgham@apple.com>
+
         Teach webkitdirs.pm to honor the --64-bit flag
         https://bugs.webkit.org/show_bug.cgi?id=122357
 
index 986b751..b42bf19 100755 (executable)
@@ -477,7 +477,7 @@ sub determineConfigurationProductDir
     determineBaseProductDir();
     determineConfiguration();
     if (isAppleWinWebKit()) {
-        my $binDir = "bin32";
+        my $binDir = isWin64() ? "bin64" : "bin32";
         $configurationProductDir = File::Spec->catdir($baseProductDir, configurationForVisualStudio(), $binDir);
     } else {
         if (usesPerConfigurationBuildDirectory()) {