Changeset 129007 in webkit


Ignore:
Timestamp:
Sep 19, 2012 8:05:15 AM (12 years ago)
Author:
Simon Hausmann
Message:

[Qt] Fix incremental builds with all-in-one-files and gccdepends

Reviewed by Tor Arne Vestbø.

Pass -MP to gcc when we use the gcc depends feature, to ensure that implicit rules
are not only created for header files but also for .cpp files. AllInOne.cpp files
include other .cpp files, and when those are removed we need those dummy rules to
avoid a "No rule to make Foo.cpp required by AllInOne.o" error.

  • qmake/config.tests/gccdepends/empty.cpp:

(main):

  • qmake/config.tests/gccdepends/gccdepends.pro:
  • qmake/mkspecs/features/default_pre.prf:
Location:
trunk/Tools
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r128999 r129007  
     12012-09-19  Simon Hausmann  <simon.hausmann@digia.com>
     2
     3        [Qt] Fix incremental builds with all-in-one-files and gccdepends
     4
     5        Reviewed by Tor Arne Vestbø.
     6
     7        Pass -MP to gcc when we use the gcc depends feature, to ensure that implicit rules
     8        are not only created for header files but also for .cpp files. AllInOne.cpp files
     9        include other .cpp files, and when those are removed we need those dummy rules to
     10        avoid a "No rule to make Foo.cpp required by AllInOne.o" error.
     11
     12        * qmake/config.tests/gccdepends/empty.cpp:
     13        (main):
     14        * qmake/config.tests/gccdepends/gccdepends.pro:
     15        * qmake/mkspecs/features/default_pre.prf:
     16
    1172012-09-19  Rick Byers  <rbyers@chromium.org>
    218
  • trunk/Tools/qmake/config.tests/gccdepends/empty.cpp

    r109904 r129007  
     1
     2int main() { return 0; }
  • trunk/Tools/qmake/config.tests/gccdepends/gccdepends.pro

    r110993 r129007  
    1 TEMPLATE = aux
     1TEMPLATE = app
    22OBJECTS_DIR = obj
    3 QMAKE_CXXFLAGS += -MD
     3CONFIG += GNUmake gcc_MD_depends
     4QMAKE_CXXFLAGS += -MP
     5TARGET = empty
    46
    57base_filename = empty
  • trunk/Tools/qmake/mkspecs/features/default_pre.prf

    r128606 r129007  
    8888    # teambuilder nor icecream is messing up the .d file output).
    8989    CONFIG += GNUmake gcc_MD_depends
     90    # This should really be added to qmake, but for now we add it here.
     91    QMAKE_CXXFLAGS += -MP
     92    QMAKE_CFLAGS += -MP
    9093}
    9194
Note: See TracChangeset for help on using the changeset viewer.