Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/windirstat/premake-4.x-stable.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJason Perkins <starkos@industriousone.com>2011-09-20 00:45:49 +0400
committerJason Perkins <starkos@industriousone.com>2011-09-20 00:45:49 +0400
commit7c9dea1f22e2b7dc82ea7ef88be0a9350ec00b55 (patch)
tree92c2e3f409fc92def0468338c9d58ac9813b96e4 /tests
parent611014c522a72ea942f5e7fc2097f48ed8e7476d (diff)
Patch 3035550: Make/Distcc outputs dependencies to wrong location
Diffstat (limited to 'tests')
-rw-r--r--tests/actions/make/test_make_pch.lua4
-rw-r--r--tests/actions/make/test_wiidev.lua2
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/actions/make/test_make_pch.lua b/tests/actions/make/test_make_pch.lua
index 8d772d4..2315f31 100644
--- a/tests/actions/make/test_make_pch.lua
+++ b/tests/actions/make/test_make_pch.lua
@@ -69,7 +69,7 @@ ifneq (,$(PCH))
$(GCH): $(PCH)
@echo $(notdir $<)
-$(SILENT) cp $< $(OBJDIR)
- $(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+ $(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -MF $(@:%.o=%.d) -c "$<"
endif
]]
end
@@ -84,7 +84,7 @@ ifneq (,$(PCH))
$(GCH): $(PCH)
@echo $(notdir $<)
-$(SILENT) cp $< $(OBJDIR)
- $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
+ $(SILENT) $(CC) $(CFLAGS) -o "$@" -MF $(@:%.o=%.d) -c "$<"
endif
]]
end
diff --git a/tests/actions/make/test_wiidev.lua b/tests/actions/make/test_wiidev.lua
index 9ed707f..fd0bfdd 100644
--- a/tests/actions/make/test_wiidev.lua
+++ b/tests/actions/make/test_wiidev.lua
@@ -35,7 +35,7 @@
CPPFLAGS += -MMD -MP -I$(LIBOGC_INC) $(MACHDEP) -MP $(DEFINES) $(INCLUDES)
CFLAGS += $(CPPFLAGS) $(ARCH)
CXXFLAGS += $(CFLAGS)
- LDFLAGS += -s lwiiuse -lbte -logc -lm -L$(LIBOGC_LIB) $(MACHDEP)
+ LDFLAGS += -s -L$(LIBOGC_LIB) $(MACHDEP)
RESFLAGS += $(DEFINES) $(INCLUDES)
]]
end