Changeset 1bf924a in mainline


Ignore:
Timestamp:
2018-07-05T21:41:25Z (6 years ago)
Author:
Dzejrou <dzejrou@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
5ceda22
Parents:
7ca51cc
git-author:
Dzejrou <dzejrou@…> (2018-07-05 20:18:25)
git-committer:
Dzejrou <dzejrou@…> (2018-07-05 21:41:25)
Message:

cpp: fixed parallel building and dependency issues by making c++ rules mirror c rules more closely

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/Makefile.common

    r7ca51cc r1bf924a  
    273273        # XXX: Do not change the order of arguments.
    274274        CC_JOB = $(JOBFILE) $(JOB) $(CC) $< -o $@
     275        CXX_JOB = $(JOBFILE) $(JOB) $(CXX) $< -o $@
    275276else
    276277        CC_JOB = $(CC) $< -o $@
     278        CXX_JOB = $(CXX) $< -o $@
    277279endif
    278280
    … …  
    380382
    381383%.o: %.cpp | depend
    382         $(CXX) $(CXXFLAGS) $(EXTRA_CXXFLAGS) -c $< -o $@
     384        $(CXX_JOB) -c -MD -MP $(DEFS) $(CXXFLAGS) $(EXTRA_CXXFLAGS)
     385
     386%.o: %.cxx | depend
     387        $(CXX_JOB) -c -MD -MP $(DEFS) $(CXXFLAGS) $(EXTRA_CXXFLAGS)
     388
     389%.o: %.cc | depend
     390        $(CXX_JOB) -c -MD -MP $(DEFS) $(CXXFLAGS) $(EXTRA_CXXFLAGS)
    383391
    384392%.test.o: %.c | depend
    … …  
    395403
    396404%.lo: %.cpp | depend
    397         $(CXX) $(CXXFLAGS) $(EXTRA_CXXFLAGS) -c $< -o $@
     405        $(CXX_JOB) -c -MD -MP $(DEFS) $(CXXFLAGS) $(EXTRA_CXXFLAGS)
     406
     407%.lo: %.cxx | depend
     408        $(CXX_JOB) -c -MD -MP $(DEFS) $(CXXFLAGS) $(EXTRA_CXXFLAGS)
     409
     410%.lo: %.cc | depend
     411        $(CXX_JOB) -c -MD -MP $(DEFS) $(CXXFLAGS) $(EXTRA_CXXFLAGS)
    398412
    399413-include $(DEPENDS)
Note: See TracChangeset for help on using the changeset viewer.