[Qt] Use config test to determine if the compiler supports -MD

We used to assume that unix systems building against Qt5 would have
a compiler that supported -MD. Although this was usually the case,
we failed to take into account broken tools for distributed builds
(e.g. teambuilder or icecream) which would end up producing .d files
in the root of the build dir instead of along-side the object file.

Now that we use a config-test to determine the support, we'll capture
those cases, unless distributed builds are enabled after the initial
build-webkit run.

Reviewed by Csaba Osztrogonác.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@109733 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 5cccc4b..266a162 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,27 @@
+2012-03-05  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
+
+        [Qt] Use config test to determine if the compiler supports -MD
+
+        We used to assume that unix systems building against Qt5 would have
+        a compiler that supported -MD. Although this was usually the case,
+        we failed to take into account broken tools for distributed builds
+        (e.g. teambuilder or icecream) which would end up producing .d files
+        in the root of the build dir instead of along-side the object file.
+
+        Now that we use a config-test to determine the support, we'll capture
+        those cases, unless distributed builds are enabled after the initial
+        build-webkit run.
+
+        Reviewed by Csaba Osztrogonác.
+
+        * Tools.pro:
+        * qmake/config.tests/gccdepends/empty.cpp: Added.
+        * qmake/config.tests/gccdepends/gccdepends.pro: Added.
+        * qmake/mkspecs/features/default_pre.prf:
+        * qmake/mkspecs/features/features.prf:
+        * qmake/mkspecs/features/unix/default_pre.prf:
+        * qmake/sync.profile:
+
 2012-03-05  Csaba Osztrogonác  <ossy@webkit.org>
 
         Qt API test buildstep throws exception after buildmaster update

diff --git a/Tools/Tools.pro b/Tools/Tools.pro
index 4e7414f..b43c26f 100644 (file)
--- a/Tools/Tools.pro
+++ b/Tools/Tools.pro
@@ -29,6 +29,7 @@ OTHER_FILES = \
     qmake/sync.profile \
     qmake/config.tests/README \
     qmake/config.tests/fontconfig/* \
+    qmake/config.tests/gccdepends/* \
     qmake/mkspecs/modules/* \
     qmake/mkspecs/features/*.prf \
     qmake/mkspecs/features/mac/*.prf \

diff --git a/Tools/qmake/config.tests/gccdepends/empty.cpp b/Tools/qmake/config.tests/gccdepends/empty.cpp
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/Tools/qmake/config.tests/gccdepends/gccdepends.pro b/Tools/qmake/config.tests/gccdepends/gccdepends.pro
new file mode 100644 (file)
index 0000000..1870304
--- /dev/null
+++ b/Tools/qmake/config.tests/gccdepends/gccdepends.pro
@@ -0,0 +1,12 @@
+TEMPLATE = aux
+SOURCES += empty.cpp
+OBJECTS_DIR = obj
+QMAKE_CXXFLAGS += -MD
+
+test.commands = test -f $$OBJECTS_DIR/empty.d && test ! -f empty.d && touch $$basename(PWD)
+test.depends = $$OBJECTS_DIR/empty.o
+QMAKE_EXTRA_TARGETS += test
+
+default.target = all
+default.depends += test
+QMAKE_EXTRA_TARGETS += default

diff --git a/Tools/qmake/mkspecs/features/default_pre.prf b/Tools/qmake/mkspecs/features/default_pre.prf
index 776728d..e80e4cf 100644 (file)
--- a/Tools/qmake/mkspecs/features/default_pre.prf
+++ b/Tools/qmake/mkspecs/features/default_pre.prf
@@ -7,6 +7,15 @@
 
 load(functions)
 
+# Load results of config tests (only supported in Qt 5)
+haveQt(5): include($${ROOT_BUILD_DIR}/Tools/qmake/.qmake.cache, , true)
+
+unix:config_test_gccdepends {
+    # We have a compiler that supports the -MD option (and neither
+    # teambuilder nor icecream is messing up the .d file output).
+    CONFIG += GNUmake gcc_MD_depends
+}
+
 # FIXME: In this case we probably want to exit early so that we
 # don't load all of the custom build tweaks needlessly.
 pro_file = $$_PRO_FILE_ # Checking the variable directly does not work

diff --git a/Tools/qmake/mkspecs/features/features.prf b/Tools/qmake/mkspecs/features/features.prf
index d9044ef..c78d918 100644 (file)
--- a/Tools/qmake/mkspecs/features/features.prf
+++ b/Tools/qmake/mkspecs/features/features.prf
@@ -5,9 +5,6 @@
 # See 'Tools/qmake/README' for an overview of the build system
 # -------------------------------------------------------------------
 
-# Load results of config tests (only supported in Qt 5)
-haveQt(5): include($${ROOT_BUILD_DIR}/Tools/qmake/.qmake.cache, , true)
-
 CONFIG(minimal) {
     DEFINES += ENABLE_NETSCAPE_PLUGIN_API=0
 }

diff --git a/Tools/qmake/mkspecs/features/unix/default_pre.prf b/Tools/qmake/mkspecs/features/unix/default_pre.prf
index 0e4e38d..91b1778 100644 (file)
--- a/Tools/qmake/mkspecs/features/unix/default_pre.prf
+++ b/Tools/qmake/mkspecs/features/unix/default_pre.prf
@@ -6,10 +6,7 @@
 
 load(functions)
 
-# Assume we use GNU make and a non-ancient GCC (compatible)
-# compiler that supports the -MD option. Relies on changes
-# introduced in Qt 5 to work correctly.
-haveQt(5): CONFIG += GNUmake gcc_MD_depends object_parallel_to_source
+haveQt(5): CONFIG += object_parallel_to_source
 
 # Expose if we are building inside Scratchbox
 SBOX_CHECK = $$(_SBOX_DIR)

diff --git a/Tools/qmake/sync.profile b/Tools/qmake/sync.profile
index 60c7f4c..f501ae3 100644 (file)
--- a/Tools/qmake/sync.profile
+++ b/Tools/qmake/sync.profile
@@ -1,4 +1,5 @@
 # This file is only used for config tests
 %configtests = (
     fontconfig => {},
+    gccdepends => {},
 );