AuroraPipeline/premake
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 1 Wiki Activity

Merged in stefanc/premake-dev/gmake-parallel-pch (pull request #118)

Browse Source 
Fix gmake parallel builds when using precompiled headers
This commit is contained in:
Jason Perkins 2014-07-08 17:32:00 -04:00
commit 3cea3afe1c
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/actions/make/_make.lua
View File

@ -135,6 +135,11 @@
_p('# %s %s makefile autogenerated by Premake', premake.action.current().shortname, kind) _p('# %s %s makefile autogenerated by Premake', premake.action.current().shortname, kind)
_p('') _p('')
if kind == "solution" then
_p('.NOTPARALLEL:')
_p('')
end
make.defaultconfig(target) make.defaultconfig(target)
_p('ifndef verbose') _p('ifndef verbose')

2
src/actions/make/make_cpp.lua
View File

@ -453,7 +453,7 @@
function make.pchRules(prj) function make.pchRules(prj)
_p('ifneq (,$(PCH))') _p('ifneq (,$(PCH))')
_p('.NOTPARALLEL: $(GCH) $(PCH)') _p('$(OBJECTS): $(GCH) $(PCH)')
_p('$(GCH): $(PCH)') _p('$(GCH): $(PCH)')
_p('\t@echo $(notdir $<)') _p('\t@echo $(notdir $<)')

4
tests/actions/make/cpp/test_make_pch.lua
View File

@ -91,7 +91,7 @@
prepareRules() prepareRules()
test.capture [[ test.capture [[
ifneq (,$(PCH)) ifneq (,$(PCH))
.NOTPARALLEL: $(GCH) $(PCH) $(OBJECTS): $(GCH) $(PCH)
$(GCH): $(PCH) $(GCH): $(PCH)
@echo $(notdir $<) @echo $(notdir $<)
$(SILENT) $(CXX) -x c++-header $(ALL_CXXFLAGS) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<" $(SILENT) $(CXX) -x c++-header $(ALL_CXXFLAGS) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<"
@ -110,7 +110,7 @@ endif
prepareRules() prepareRules()
test.capture [[ test.capture [[
ifneq (,$(PCH)) ifneq (,$(PCH))
.NOTPARALLEL: $(GCH) $(PCH) $(OBJECTS): $(GCH) $(PCH)
$(GCH): $(PCH) $(GCH): $(PCH)
@echo $(notdir $<) @echo $(notdir $<)
$(SILENT) $(CC) -x c-header $(ALL_CFLAGS) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<" $(SILENT) $(CC) -x c-header $(ALL_CFLAGS) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<"