Commit aac0d9e6 authored by Kevin Modzelewski's avatar Kevin Modzelewski

Fix "GITREV differs between precompiled header and command line" errors

Don't pass that particular command line flag to the pch compile.
parent 5c979625
...@@ -642,8 +642,8 @@ $$(NONSTDLIB_SRCS:.cpp=$1.o): CXXFLAGS:=$2 ...@@ -642,8 +642,8 @@ $$(NONSTDLIB_SRCS:.cpp=$1.o): CXXFLAGS:=$2
$$(SRCS:.cpp=$1.o.bc): CXXFLAGS:=$2 $$(SRCS:.cpp=$1.o.bc): CXXFLAGS:=$2
## Need to set CXXFLAGS so that this rule doesn't inherit the '-include' rule from the ## Need to set CXXFLAGS so that this rule doesn't inherit the '-include' rule from the
## thing that's calling it: ## thing that's calling it. At the same time, also filter out "-DGITREV=foo".
%$1.h.pch: CXXFLAGS:=$(2) %$1.h.pch: CXXFLAGS:=$(filter-out -DGITREV%,$(2))
%$1.h.pch: %.h $$(BUILD_SYSTEM_DEPS) %$1.h.pch: %.h $$(BUILD_SYSTEM_DEPS)
$$(ECHO) Compiling $$@ $$(ECHO) Compiling $$@
$$(VERB) rm -f $$@-* $$(VERB) rm -f $$@-*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment