Changeset 48593 in vbox

Timestamp:

Sep 20, 2013 1:44:49 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

89153

Message:

Need to detect some MinGW32/64 options, of course.

File:

• trunk/Config.kmk (modified) (2 diffs)

trunk/Config.kmk

@@ -2212 +2212 @@
 # can be no harm in just dropping them until cygwin is mp safe.
 ifeq ($(KBUILD_HOST),win)
-VBOX_GCC_CHECK_CC = $(2)
-VBOX_GCC_CHECK_CXX = $(2)
-VBOX_GCC_CHECK_LD = $(2)
-VBOX_GCC32_CHECK_CXX = $(2)
+ VBOX_GCC_CHECK_EX_CC  = $(3)
+ VBOX_GCC_CHECK_EX_CXX = $(3)
+ VBOX_GCC_CHECK_EX_LD  = $(3)
+ VBOX_GCC_CHECK_CC = $(2)
+ VBOX_GCC_CHECK_CXX = $(2)
+ VBOX_GCC_CHECK_LD = $(2)
+ VBOX_GCC32_CHECK_CXX = $(2)
 else
-VBOX_GCC_CHECK_CC = $(shell \
-   if $(TOOL_$(VBOX_GCC_TOOL)_CC) $(subst -Wno-,-W,$(1)) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \
-   then echo "$(1)"; \
-   else echo "$(2)"; fi; )
-
-VBOX_GCC_CHECK_CXX = $(shell \
-   if $(TOOL_$(VBOX_GCC_TOOL)_CXX) $(subst -Wno-,-W,$(1)) -S -o /dev/null -xc++ /dev/null > /dev/null 2>&1; \
-   then echo "$(1)"; \
-   else echo "$(2)"; fi; )
-
-VBOX_GCC_CHECK_LD = $(shell \
-   if $(TOOL_$(VBOX_GCC_TOOL)_LD) -Wl,$(1) $(if $(eq $(KBUILD_HOST),darwin),-Wl$(COMMA)-u$(COMMA)start -Wl$(COMMA)-undefined$(COMMA)dynamic_lookup,) -nostdlib -o /dev/null -xc /dev/null > /dev/null 2>&1 ;\
-   then echo "-Wl,$(1)"; \
-   else echo "$(2)"; fi; )
-
-VBOX_GCC32_CHECK_CXX = $(shell \
-   if $(TOOL_$(VBOX_GCC32_TOOL)_CXX) $(1) -S -o /dev/null -xc++ /dev/null > /dev/null 2>&1; \
-   then echo "$(1)"; \
-   else echo "$(2)"; fi; )
-endif
-
-ifeq ($(KBUILD_HOST),win)
-# This isn't important (yet) on windows, so cook the result until
-# cygwin is feeling better.
-VBOX_GCC_VERSION := $(int-add $(int-mul 10000, 3), $(int-mul 100, 3), 3)
+ VBOX_GCC_CHECK_EX_CC = $(shell \
+    if $(1) $(subst -Wno-,-W,$(2)) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(2)"; else echo "$(3)"; fi; )
+ VBOX_GCC_CHECK_EX_CXX = $(shell \
+    if $(1) $(subst -Wno-,-W,$(2)) -S -o /dev/null -xc++ /dev/null > /dev/null 2>&1; then echo "$(2)"; else echo "$(3)"; fi; )
+ VBOX_GCC_CHECK_EX_LD = $(shell \
+    if $(1) -Wl,$(2) $(if $(eq $(KBUILD_HOST),darwin),-Wl$(COMMA)-u$(COMMA)start -Wl$(COMMA)-undefined$(COMMA)dynamic_lookup,) \
+            -nostdlib -o /dev/null -xc /dev/null > /dev/null 2>&1; \
+    then echo "-Wl,$(2)"; else echo "$(3)"; fi; )
+
+ VBOX_GCC_CHECK_CC    = $(call VBOX_GCC_CHECK_EX_CC,  $(TOOL_$(VBOX_GCC_TOOL)_CC),$1,$2)
+ VBOX_GCC_CHECK_CXX   = $(call VBOX_GCC_CHECK_EX_CXX, $(TOOL_$(VBOX_GCC_TOOL)_CXX),$1,$2)
+ VBOX_GCC_CHECK_LD    = $(call VBOX_GCC_CHECK_EX_LD,  $(TOOL_$(VBOX_GCC_TOOL)_LD),$1,$2)
+ VBOX_GCC32_CHECK_CXX = $(call VBOX_GCC_CHECK_EX_CXX, $(TOOL_$(VBOX_GCC32_TOOL)_CXX),$1,$2)
+endif
+
+ifeq ($(KBUILD_HOST),win) ## @todo can drop this now, we're not using cygwin.
+ # This isn't important (yet) on windows, so cook the result until
+ # cygwin is feeling better.
+ VBOX_GCC_VERSION := $(int-add $(int-mul 10000, 3), $(int-mul 100, 3), 3)
 else
-# This is kind of bad, the returned string needs to be re-evaluated before use.
-# The reason for this hack is that the windows kmk_ash cannot deal with $((1+1)).
-# Some versions of gcc (e.g. openSUSE11) return only major.minor on `gcc -dumpversion`.
-VBOX_GCC_VERSION = $(shell \
-  $(1) -dumpversion | $(SED_EXT) 's|\([0-9]\)\.\([0-9]\)\.\{0,1\}\([0-9]\{0,1\}\).*|$$(int-add $$(int-mul 10000, \1), $$(int-mul 100, \2), $$(firstword \3 0))|' )
-endif
+ # This is kind of bad, the returned string needs to be re-evaluated before use.
+ # The reason for this hack is that the windows kmk_ash cannot deal with $((1+1)).
+ # Some versions of gcc (e.g. openSUSE11) return only major.minor on `gcc -dumpversion`.
+ VBOX_GCC_VERSION = $(shell \
+    $(1) -dumpversion | $(SED_EXT) 's|\([0-9]\)\.\([0-9]\)\.\{0,1\}\([0-9]\{0,1\}\).*|$$(int-add $$(int-mul 10000, \1), $$(int-mul 100, \2), $$(firstword \3 0))|' )
+endif
+
+# Find MinGW cross compilers for EFI on non-windows systems. We need to probe
+# them for supported options in the Dynamic Config.kmk section below.
+ifdef VBOX_WITH_EFI
+ ifneq ($(KBUILD_HOST),win)
+  ifndef VBOX_PATH_PREFIX_MINGW32
+   VBOX_PATH_PREFIX_MINGW32 := $(firstword \
+        $(which i686-w64-mingw32-gcc) \
+        $(which i686-w32-mingw32-gcc) \
+        $(which i686-pc-mingw32-gcc) \
+        $(which i586-mingw32msvc-gcc) \
+        )# Add more variants.
+   ifdef VBOX_PATH_PREFIX_MINGW32
+    VBOX_PATH_PREFIX_MINGW32 := $(substr $(VBOX_PATH_PREFIX_MINGW32), 1, $(expr $(length-var VBOX_PATH_PREFIX_MINGW32) - 3))
+   endif
+  endif
+  ifndef VBOX_PATH_PREFIX_MINGW64
+   VBOX_PATH_PREFIX_MINGW64 := $(firstword \
+        $(which x86_64-w64-mingw64-gcc) \
+        $(which x86_64-w64-mingw32-gcc) \
+        $(which x86_64-pc-mingw64-gcc) \
+        $(which x86_64-pc-mingw32-gcc) \
+        $(which x86_64-w32-mingw32-gcc) \
+        )# Add more variants.
+   ifdef VBOX_PATH_PREFIX_MINGW64
+    VBOX_PATH_PREFIX_MINGW64 := $(substr $(VBOX_PATH_PREFIX_MINGW64), 1, $(expr $(length-var VBOX_PATH_PREFIX_MINGW64) - 3))
+   endif
+  endif
+  if defined(VBOX_PATH_PREFIX_MINGW32) || defined(VBOX_PATH_PREFIX_MINGW64)
+   if !defined(VBOX_PATH_PREFIX_MINGW32)
+    VBOX_PATH_PREFIX_MINGW32 = $(VBOX_PATH_PREFIX_MINGW64)
+   else if !defined(VBOX_PATH_PREFIX_MINGW64)
+    VBOX_PATH_PREFIX_MINGW64 = $(VBOX_PATH_PREFIX_MINGW32)
+   endif
+   VBOX_EFI_TOOL_CHAIN := UNIXGCC
+  endif
+ endif # !win
+endif # VBOX_WITH_EFI
 
 # YASM macros
@@ -2362 +2397 @@
         $(QUIET)$(APPEND) '$@' 'VBOX_YASM_Wno-segreg-in-64bit  ?= $(call VBOX_YASM_CHECK,-Wno-segreg-in-64bit,)'
 
+ifdef VBOX_PATH_PREFIX_MINGW32
+        $(QUIET)$(APPEND) '$@' 'VBOX_MINGW32_Wno-array-bounds            ?= $(call VBOX_GCC_CHECK_EX_CXX,$(VBOX_PATH_PREFIX_MINGW32)g++ -m32,-Wno-array-bounds,)'
+        $(QUIET)$(APPEND) '$@' 'VBOX_MINGW32_Wno-unused-but-set-variable ?= $(call VBOX_GCC_CHECK_EX_CXX,$(VBOX_PATH_PREFIX_MINGW32)g++ -m32,-Wno-unused-but-set-variable,)'
+        $(QUIET)$(APPEND) '$@' 'VBOX_MINGW32_Wno-maybe-uninitialized     ?= $(call VBOX_GCC_CHECK_EX_CXX,$(VBOX_PATH_PREFIX_MINGW32)g++ -m32,-Wno-maybe-uninitialized,)'
+endif
+ifdef VBOX_PATH_PREFIX_MINGW64
+        $(QUIET)$(APPEND) '$@' 'VBOX_MINGW64_Wno-array-bounds            ?= $(call VBOX_GCC_CHECK_EX_CXX,$(VBOX_PATH_PREFIX_MINGW64)g++ -m64,-Wno-array-bounds,)'
+        $(QUIET)$(APPEND) '$@' 'VBOX_MINGW64_Wno-unused-but-set-variable ?= $(call VBOX_GCC_CHECK_EX_CXX,$(VBOX_PATH_PREFIX_MINGW64)g++ -m64,-Wno-unused-but-set-variable,)'
+        $(QUIET)$(APPEND) '$@' 'VBOX_MINGW64_Wno-maybe-uninitialized     ?= $(call VBOX_GCC_CHECK_EX_CXX,$(VBOX_PATH_PREFIX_MINGW64)g++ -m64,-Wno-maybe-uninitialized,)'
+endif
         $(QUIET)$(ECHO) '========= START OF $@ ========='
         $(QUIET)$(CAT) $@