diff options
author | Jason Perkins <starkos@industriousone.com> | 2011-10-21 00:44:09 +0400 |
---|---|---|
committer | Jason Perkins <starkos@industriousone.com> | 2011-10-21 00:44:09 +0400 |
commit | 6ddd47a765805af55a9a5fd91d8b840241b5e52c (patch) | |
tree | 5590db9cb072dcab41afe2f33f143bf030de440c /tests | |
parent | 1cb9aad19be8ac08da20600a813e62ebdd40091f (diff) |
Patch 3372345: Gmake action's PCHs don't work with Mingw (Martin Ridgers)
Diffstat (limited to 'tests')
-rw-r--r-- | tests/actions/make/test_make_pch.lua | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/actions/make/test_make_pch.lua b/tests/actions/make/test_make_pch.lua index 2315f31..f52bf3e 100644 --- a/tests/actions/make/test_make_pch.lua +++ b/tests/actions/make/test_make_pch.lua @@ -68,7 +68,11 @@ ifneq (,$(PCH)) $(GCH): $(PCH) @echo $(notdir $<) +ifeq (posix,$(SHELLTYPE)) -$(SILENT) cp $< $(OBJDIR) +else + $(SILENT) xcopy /D /Y /Q "$(subst /,\,$<)" "$(subst /,\,$(OBJDIR))" 1>nul +endif $(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -MF $(@:%.o=%.d) -c "$<" endif ]] @@ -83,7 +87,11 @@ endif ifneq (,$(PCH)) $(GCH): $(PCH) @echo $(notdir $<) +ifeq (posix,$(SHELLTYPE)) -$(SILENT) cp $< $(OBJDIR) +else + $(SILENT) xcopy /D /Y /Q "$(subst /,\,$<)" "$(subst /,\,$(OBJDIR))" 1>nul +endif $(SILENT) $(CC) $(CFLAGS) -o "$@" -MF $(@:%.o=%.d) -c "$<" endif ]] |