Changeset 63882 in vbox

Timestamp:

Sep 19, 2016 12:13:32 PM (8 years ago)

Author:

vboxsync

Message:

Config.kmk: Made VBOX_GCC_CHECK_* a little bit more thorough.

File:

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

trunk/Config.kmk

@@ -2451 +2451 @@
 else
  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; )
+    if $(1) $(subst -Wno-,-W,$(2)) -c -o /dev/null -xc   $(PATH_OUT)/DynamicConfig.c   > /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; )
+    if $(1) $(subst -Wno-,-W,$(2)) -c -o /dev/null -xc++ $(PATH_OUT)/DynamicConfig.cpp > /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,) \
@@ -2542 +2542 @@
         | $(SED_EXT) -n -e 's|^ *pylint *\([0-9][0-9]*\).\([0-9][0-9]*\)\.\([0-9][0-9]*\).*$(DOLLAR)|$$(expr \1 * 10000 + \2 * 100 + \3)|p' )
 
+# Test C and C++ files.
+$(PATH_OUT)/DynamicConfig.c $(PATH_OUT)/DynamicConfig.cpp:
+        $(QUIET)$(APPEND) -tn "$@" "int foobar(void)" "{" "    return 42;" "}" ""
+
 # No $(QUIET) here as it's interesting to see what goes into the file.
 $(PATH_OUT)/DynamicConfig.kmk: \
@@ -2552 +2556 @@
                 $(VBOX_GCC32_PATH_CXX) \
                 $(if-expr "$(KBUILD_HOST).$(KBUILD_HOST_ARCH)" == "solaris.amd64" && $(KBUILD_HOST_VERSION_MINOR) >= 11 \
-                        , /platform/i86pc/kernel/$(KBUILD_HOST_ARCH)/unix,)
+                        , /platform/i86pc/kernel/$(KBUILD_HOST_ARCH)/unix,) \
+                | $(PATH_OUT)/DynamicConfig.c $(PATH_OUT)/DynamicConfig.cpp
         $(call MSG_GENERATE,,$@,)
         $(QUIET)$(RM) -f '$@'