Changeset 109733 in webkit


Ignore:
Timestamp:
Mar 5, 2012 5:00:09 AM (12 years ago)
Author:
vestbo@webkit.org
Message:

[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.

Location:
trunk/Tools
Files:
3 added
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r109726 r109733  
     12012-03-05  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
     2
     3        [Qt] Use config test to determine if the compiler supports -MD
     4
     5        We used to assume that unix systems building against Qt5 would have
     6        a compiler that supported -MD. Although this was usually the case,
     7        we failed to take into account broken tools for distributed builds
     8        (e.g. teambuilder or icecream) which would end up producing .d files
     9        in the root of the build dir instead of along-side the object file.
     10
     11        Now that we use a config-test to determine the support, we'll capture
     12        those cases, unless distributed builds are enabled after the initial
     13        build-webkit run.
     14
     15        Reviewed by Csaba Osztrogonác.
     16
     17        * Tools.pro:
     18        * qmake/config.tests/gccdepends/empty.cpp: Added.
     19        * qmake/config.tests/gccdepends/gccdepends.pro: Added.
     20        * qmake/mkspecs/features/default_pre.prf:
     21        * qmake/mkspecs/features/features.prf:
     22        * qmake/mkspecs/features/unix/default_pre.prf:
     23        * qmake/sync.profile:
     24
    1252012-03-05  Csaba Osztrogonác  <ossy@webkit.org>
    226
  • trunk/Tools/Tools.pro

    r106650 r109733  
    3030    qmake/config.tests/README \
    3131    qmake/config.tests/fontconfig/* \
     32    qmake/config.tests/gccdepends/* \
    3233    qmake/mkspecs/modules/* \
    3334    qmake/mkspecs/features/*.prf \
  • trunk/Tools/qmake/mkspecs/features/default_pre.prf

    r105729 r109733  
    77
    88load(functions)
     9
     10# Load results of config tests (only supported in Qt 5)
     11haveQt(5): include($${ROOT_BUILD_DIR}/Tools/qmake/.qmake.cache, , true)
     12
     13unix:config_test_gccdepends {
     14    # We have a compiler that supports the -MD option (and neither
     15    # teambuilder nor icecream is messing up the .d file output).
     16    CONFIG += GNUmake gcc_MD_depends
     17}
    918
    1019# FIXME: In this case we probably want to exit early so that we
  • trunk/Tools/qmake/mkspecs/features/features.prf

    r109667 r109733  
    55# See 'Tools/qmake/README' for an overview of the build system
    66# -------------------------------------------------------------------
    7 
    8 # Load results of config tests (only supported in Qt 5)
    9 haveQt(5): include($${ROOT_BUILD_DIR}/Tools/qmake/.qmake.cache, , true)
    107
    118CONFIG(minimal) {
  • trunk/Tools/qmake/mkspecs/features/unix/default_pre.prf

    r103935 r109733  
    77load(functions)
    88
    9 # Assume we use GNU make and a non-ancient GCC (compatible)
    10 # compiler that supports the -MD option. Relies on changes
    11 # introduced in Qt 5 to work correctly.
    12 haveQt(5): CONFIG += GNUmake gcc_MD_depends object_parallel_to_source
     9haveQt(5): CONFIG += object_parallel_to_source
    1310
    1411# Expose if we are building inside Scratchbox
  • trunk/Tools/qmake/sync.profile

    r102776 r109733  
    22%configtests = (
    33    fontconfig => {},
     4    gccdepends => {},
    45);
Note: See TracChangeset for help on using the changeset viewer.