Changeset 40787 in vbox

Timestamp:

Apr 6, 2012 11:01:59 AM (13 years ago)

Author:

vboxsync

Message:

Config.kmk: Make GCCConfig.kmk depend on the gcc and g++ binaries to catch most compiler upgrades.

File:

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

trunk/Config.kmk

@@ -2127 +2127 @@
 
 # No $(QUIET) here as it's interesting to see what goes into the file.
-$(PATH_OUT)/GCCConfig.kmk: $(PATH_ROOT)/Config.kmk $(LOCALCFG) $(AUTOCFG)
+$(PATH_OUT)/GCCConfig.kmk: \
+                $(PATH_ROOT)/Config.kmk \
+                $(LOCALCFG) \
+                $(AUTOCFG) \
+                $(VBOX_GCC_PATH_CC) \
+                $(VBOX_GCC_PATH_CXX) \
+                $(VBOX_GCC32_PATH_CC) \
+                $(VBOX_GCC32_PATH_CXX)
         $(call MSG_GENERATE,,$@,)
         $(QUIET)$(RM) -f '$@'
@@ -2133 +2140 @@
 
 # HC compiler switch detection.
+        $(APPEND) '$@' 'VBOX_GCC_PATH_CC               ?= $(which $(TOOL_$(VBOX_GCC_TOOL)_CC))'
+        $(APPEND) '$@' 'VBOX_GCC_PATH_CXX              ?= $(which $(TOOL_$(VBOX_GCC_TOOL)_CXX))'
         $(APPEND) '$@' 'VBOX_GCC_VERSION_CC            ?= $(call VBOX_GCC_VERSION,$(TOOL_$(VBOX_GCC_TOOL)_CC))'
         $(APPEND) '$@' 'VBOX_GCC_VERSION_CXX           ?= $(call VBOX_GCC_VERSION,$(TOOL_$(VBOX_GCC_TOOL)_CXX))'
@@ -2196 +2205 @@
 endif
 # 32-bit (GC) compiler switch detection.
+        $(APPEND) '$@' 'VBOX_GCC32_PATH_CC             ?= $(which $(TOOL_$(VBOX_GCC32_TOOL)_CC))'
+        $(APPEND) '$@' 'VBOX_GCC32_PATH_CXX            ?= $(which $(TOOL_$(VBOX_GCC32_TOOL)_CXX))'
         $(APPEND) '$@' 'VBOX_GCC32_VERSION_CC          ?= $(call VBOX_GCC_VERSION,$(TOOL_$(VBOX_GCC32_TOOL)_CC))'
         $(APPEND) '$@' 'VBOX_GCC32_VERSION_CXX         ?= $(call VBOX_GCC_VERSION,$(TOOL_$(VBOX_GCC32_TOOL)_CXX))'