Changeset 71902 in vbox for trunk

Timestamp:

Apr 18, 2018 3:19:39 PM (7 years ago)

Author:

vboxsync

Message:

configure.vbs: Pick the 64-bit kBuild binaries on 64-bit hosts. Buggy test forced 32-bit regardless of any other considerations.

File:

• trunk/configure.vbs (modified) (3 diffs)

trunk/configure.vbs

@@ -45 +45 @@
 dim g_strTargetArch
 g_strTargetArch = ""
+
+dim g_strHostArch
+g_strHostArch = ""
 
 dim g_blnDisableCOM, g_strDisableCOM
@@ -934 +937 @@
    Wscript.Echo " Host architecture: " & str & "."
    EnvPrint "set KBUILD_HOST_ARCH=" & str
+   g_strHostArch = str
 
    str = EnvGetFirst("KBUILD_HOST_CPU", "BUILD_PLATFORM_CPU")
@@ -948 +952 @@
    '
    if g_strPathkBuildBin = "" then
-      g_strPathkBuildBin = g_strPathkBuild & "/bin/win." & g_strTargetArch
-      if FileExists(g_strPathkBuild & "/kmk.exe") = False then
+      g_strPathkBuildBin = g_strPathkBuild & "/bin/win." & g_strHostArch
+      if FileExists(g_strPathkBuildBin & "/kmk.exe") = False then
          g_strPathkBuildBin = g_strPathkBuild & "/bin/win.x86"
       end if