Changeset 2473 in vbox

Timestamp:

May 3, 2007 10:40:16 PM (18 years ago)

Author:

vboxsync

Message:

kmk startup is annoyingly slow because of all the GCC checks. Detect these once and cache the result in $(PATH_OUT).

File:

• trunk/Config.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -805 +805 @@
 #
 # GCC stuff properties.
-#
-# These will be resolved on the first kmk invocation and passed on to recursive
-# instances in the environment.
-#q
-# Note. If we add much more to here, we should seriously consider moving this to a
-#       gcc configure script which we invoke automatically.
+# Most of this is resolved on first kmk invocation and cached in PATH_OUT.
+#
+# Note! That a harmless warning is printed if the file doesn't exist.
+# Note! Changes in GCC are not detected automatically (yet).
 #
 include $(PATH_KBUILD)/tools/$(VBOX_GCC_TOOL).kmk
-
-ifndef VBOX_GCC_LIBGCC
- export VBOX_GCC_LIBGCC := $(shell $(TOOL_$(VBOX_GCC_TOOL)_CC) -print-libgcc-file-name)
-endif
-
-# HC compiler switch detction.
+ifneq ($(VBOX_GCC_TOOL),$(VBOX_GCC32_TOOL))
+ include $(PATH_KBUILD)/tools/$(VBOX_GCC32_TOOL).kmk
+endif
+
 VBOX_GCC_CHECK_CC = $(shell \
    if $(TOOL_$(VBOX_GCC_TOOL)_CC) $(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) $(1) -S -o /dev/null -xc++ /dev/null > /dev/null 2>&1; \
    then echo "$(1)"; \
    else echo "$(2)"; fi; )
-ifeq ($(origin VBOX_GCC_Wno-pointer-sign),undefined)
- export VBOX_GCC_Wno-pointer-sign := $(call VBOX_GCC_CHECK_CC,-Wno-pointer-sign,)
-endif
-ifeq ($(origin VBOX_GCC_Wno-variadic-macros),undefined)
- export VBOX_GCC_Wno-variadic-macros := $(call VBOX_GCC_CHECK_CXX,-Wno-variadic-macros,)
-endif
-ifeq ($(origin VBOX_GCC_Wno-invalid-offsetof),undefined)
- export VBOX_GCC_Wno-invalid-offsetof := $(call VBOX_GCC_CHECK_CXX,-Wno-invalid-offsetof,)
-endif
-ifeq ($(origin VBOX_GCC_Wno-extra),undefined)
- export VBOX_GCC_Wno-extra := $(call VBOX_GCC_CHECK_CXX,-Wno-extra)
-endif
-ifeq ($(origin VBOX_GCC_fno-stack-protector),undefined)
- export VBOX_GCC_fno-stack-protector := $(call VBOX_GCC_CHECK_CC,-fno-stack-protector,)
-endif
-# Set default attribute for ELF symbols to ``hidden'' to reduce the number
-# of relocation entries and PLT indirections in shared libraries.
-ifeq ($(origin VBOX_GCC_fvisibility-hidden),undefined)
- export VBOX_GCC_fvisibility-hidden := $(call VBOX_GCC_CHECK_CC,-fvisibility=hidden -DVBOX_HAVE_VISIBILITY_HIDDEN,)
-endif
-# Set default attribute for inline functions to ``hidden'' to reduce the number
-# of relocation entries and PLT indirections in shared libraries.
-ifeq ($(origin VBOX_GCC_fvisibility-inlines-hidden),undefined)
- export VBOX_GCC_fvisibility-inlines-hidden := $(call VBOX_GCC_CHECK_CXX,-fvisibility-inlines-hidden,)
-endif
-
-# 32-bit (GC) compiler switch detection.
+
 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; )
-ifneq ($(VBOX_GCC_TOOL),$(VBOX_GCC32_TOOL))
- include $(PATH_KBUILD)/tools/$(VBOX_GCC32_TOOL).kmk
- ifeq ($(origin VBOX_GCC32_Wno-variadic-macros),undefined)
-  export VBOX_GCC32_Wno-variadic-macros := $(call VBOX_GCC32_CHECK_CXX,-Wno-variadic-macros,)
- endif
- ifndef VBOX_GCC32_LIBGCC
-  export VBOX_GCC32_LIBGCC := $(shell $(TOOL_$(VBOX_GCC32_TOOL)_CC) -print-libgcc-file-name)
- endif
-else
- VBOX_GCC32_Wno-variadic-macros ?= $(VBOX_GCC_Wno-variadic-macros)
- VBOX_GCC32_LIBGCC ?= $(VBOX_GCC_LIBGCC)
-endif
-
-# Find the compiler defines (for IPRT no-crt).
-ifndef VBOX_PATH_GCC_INCS
- export VBOX_PATH_GCC_INCS := $(abspath $(dir $(shell LC_ALL=C $(TOOL_$(VBOX_GCC_TOOL)_CC) -print-libgcc-file-name)))/include
-endif
-
-# L4
+
+# No $(QUIET) here as it's interesting to see what goes into the file.
+$(PATH_OUT)/GCCConfig.kmk: $(PATH_ROOT)/Config.kmk $(LOCALCFG) $(AUTOCFG)
+        $(call MSG_GENERATE,,$@,)
+        $(QUIET)$(RM) -f "$@"
+
+        @# HC compiler switch detction.
+        $(APPEND) "$@" "VBOX_GCC_LIBGCC                ?= $(shell $(TOOL_$(VBOX_GCC_TOOL)_CC) -print-libgcc-file-name)"
+        $(APPEND) "$@" "VBOX_GCC_Wno-pointer-sign      ?= $(call VBOX_GCC_CHECK_CC,-Wno-pointer-sign,)"
+        $(APPEND) "$@" "VBOX_GCC_Wno-variadic-macros   ?= $(call VBOX_GCC_CHECK_CXX,-Wno-variadic-macros,)"
+        $(APPEND) "$@" "VBOX_GCC_Wno-invalid-offsetof  ?= $(call VBOX_GCC_CHECK_CXX,-Wno-invalid-offsetof,)"
+        $(APPEND) "$@" "VBOX_GCC_Wno-extra             ?= $(call VBOX_GCC_CHECK_CXX,-Wno-extra)"
+        $(APPEND) "$@" "VBOX_GCC_fno-stack-protector   ?= $(call VBOX_GCC_CHECK_CC,-fno-stack-protector,)"
+        @# Set default attribute for ELF and MACH-O symbols to ``hidden'' to reduce the number
+        @# of relocation entries and PLT indirections in shared libraries.
+        $(APPEND) "$@" "VBOX_GCC_fvisibility-hidden    ?= $(call VBOX_GCC_CHECK_CC,-fvisibility=hidden -DVBOX_HAVE_VISIBILITY_HIDDEN,)"
+        @# Set default attribute for inline functions to ``hidden'' to reduce the number
+        @# of relocation entries and PLT indirections in shared libraries.
+        $(APPEND) "$@" "VBOX_GCC_fvisibility-inlines-hidden ?= $(call VBOX_GCC_CHECK_CXX,-fvisibility-inlines-hidden,)"
+        @# Find the compiler includes for IPRT no-crt.
+        $(APPEND) "$@" "VBOX_PATH_GCC_INCS             ?= $(abspath $(dir $(shell LC_ALL=C $(TOOL_$(VBOX_GCC_TOOL)_CC) -print-libgcc-file-name)))/include"
+
+        @# 32-bit (GC) compiler switch detection.
+        $(APPEND) "$@" "VBOX_GCC32_LIBGCC              ?= $(shell $(TOOL_$(VBOX_GCC32_TOOL)_CC) -print-libgcc-file-name)"
+        $(APPEND) "$@" "VBOX_GCC32_Wno-variadic-macros ?= $(call VBOX_GCC32_CHECK_CXX,-Wno-variadic-macros,)"
+
 ifeq ($(BUILD_TARGET),l4)
- ifndef VBOX_PATH_L4_GCC3_INSTALL
-  export VBOX_PATH_L4_GCC3_INSTALL := $(shell LANG=C $(TOOL_$(VBOX_GCC_TOOL)_CC) -print-search-dirs|sed -ne 's+^install: \(.*[^/][^/]*\)/\?+\1+p')
- endif
+        @# L4
+        $(APPEND) "$@" "VBOX_PATH_L4_GCC3_INSTALL      ?= $(shell LANG=C $(TOOL_$(VBOX_GCC_TOOL)_CC) -print-search-dirs|sed -ne 's+^install: \(.*[^/][^/]*\)/\?+\1+p')"
+endif
+
+include $(PATH_OUT)/GCCConfig.kmk
+
+ifeq ($(BUILD_TARGET),l4)
  VBOX_L4_GCC3_INCS := $(VBOX_PATH_L4_GCC3_INSTALL)/include
  # L4_GPP3_INCS := \