[vbox-dev] [PATCH] 64Bit: ensure that KBUILD_TARGET_ARCH is set

[Bodo]

===================================================================
--- a/configure.vbs	(revision 43854)
+++ b/configure.vbs	(working copy)
@@ -853,40 +853,6 @@
       MsgWarning "Found unknown KBUILD_TYPE value '" & str &"' in your
environment. Setting it to 'release'."
    end if
 
-   str = EnvGetFirst("KBUILD_TARGET", "BUILD_TARGET")
-   if   (str <> "") _
-    And (InStr(1, "win|win32|win64", str) <= 0) then '' @todo later only
'win' will be valid. remember to fix this check!
-      EnvPrint "set KBUILD_TARGET=win"
-      EnvSet "KBUILD_TARGET", "win"
-      MsgWarning "Found unknown KBUILD_TARGET value '" & str &"' in your
environment. Setting it to 'win32'."
-   end if
-
-   str = EnvGetFirst("KBUILD_TARGET_ARCH", "BUILD_TARGET_ARCH")
-   if   (str <> "") _
-    And (InStr(1, "x86|amd64", str) <= 0) then
-      EnvPrint "set KBUILD_TARGET_ARCH=x86"
-      EnvSet "KBUILD_TARGET_ARCH", "x86"
-      MsgWarning "Found unknown KBUILD_TARGET_ARCH value '" & str &"' in
your environment. Setting it to 'x86'."
-      str = "x86"
-   end if
-   if str <> "" then
-      g_strTargetArch = str
-   elseif (EnvGet("PROCESSOR_ARCHITEW6432") = "AMD64" ) _
-       Or (EnvGet("PROCESSOR_ARCHITECTURE") = "AMD64" ) then
-      g_strTargetArch = "amd64"
-   else
-      g_strTargetArch = "x86"
-   end if
-
-   str = EnvGetFirst("KBUILD_TARGET_CPU", "BUILD_TARGET_CPU")
-    ' perhaps a bit pedantic this since this isn't clearly define nor used
much...
-   if   (str <> "") _
-    And (InStr(1, "i386|i486|i686|i786|i868|k5|k6|k7|k8", str) <= 0) then
-      EnvPrint "set BUILD_TARGET_CPU=i386"
-      EnvSet "KBUILD_TARGET_CPU", "i386"
-      MsgWarning "Found unknown KBUILD_TARGET_CPU value '" & str &"' in
your environment. Setting it to 'i386'."
-   end if
-
    str = EnvGetFirst("KBUILD_HOST", "BUILD_PLATFORM")
    if   (str <> "") _
     And (InStr(1, "win|win32|win64", str) <= 0) then '' @todo later only
'win' will be valid. remember to fix this check!
@@ -918,7 +884,38 @@
       EnvSet "KBUILD_HOST_CPU", "i386"
       MsgWarning "Found unknown KBUILD_HOST_CPU value '" & str &"' in your
environment. Setting it to 'i386'."
    end if
+   
+   str = EnvGetFirst("KBUILD_TARGET", "BUILD_TARGET")
+   if   (str <> "") _
+    And (InStr(1, "win|win32|win64", str) <= 0) then '' @todo later only
'win' will be valid. remember to fix this check!
+      EnvPrint "set KBUILD_TARGET=win"
+      EnvSet "KBUILD_TARGET", "win"
+      MsgWarning "Found unknown KBUILD_TARGET value '" & str &"' in your
environment. Setting it to 'win32'."
+   end if
 
+   str = EnvGetFirst("KBUILD_TARGET_ARCH", "BUILD_TARGET_ARCH")
+   if (str <> "") then
+     if (InStr(1, "x86|amd64", str) <= 0) then
+       MsgWarning "Found unknown KBUILD_TARGET_ARCH value '" & str &"' in
your environment. Setting it to 'x86'."
+	   g_strTargetArch = "x68"
+	 else
+	   g_strTargetArch = str
+	 end if
+   else
+     g_strTargetArch = EnvGet("KBUILD_HOST_ARCH")
+   end if
+   EnvPrint "set KBUILD_TARGET_ARCH=" & g_strTargetArch
+   EnvSet "KBUILD_TARGET_ARCH", g_strTargetArch
+
+   str = EnvGetFirst("KBUILD_TARGET_CPU", "BUILD_TARGET_CPU")
+    ' perhaps a bit pedantic this since this isn't clearly define nor used
much...
+   if   (str <> "") _
+    And (InStr(1, "i386|i486|i686|i786|i868|k5|k6|k7|k8", str) <= 0) then
+      EnvPrint "set BUILD_TARGET_CPU=i386"
+      EnvSet "KBUILD_TARGET_CPU", "i386"
+      MsgWarning "Found unknown KBUILD_TARGET_CPU value '" & str &"' in
your environment. Setting it to 'i386'."
+   end if   
+
    '
    ' Determin the location of the kBuild binaries.
    '

This Patch is contributed under the MIT license

Regards
Bodo