diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2013-09-30 17:28:14 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2013-09-30 17:28:14 -0700 |
| commit | e1c116ca35e79830173bcb3b91b17aaf360479fb (patch) | |
| tree | 6f1e08f4e001684d2b3ce9e5eb3abfd82deaf8e7 | |
| parent | 9f438b1bccca459e484560232e5b6e7dfdbacd61 (diff) | |
| download | tmwa-e1c116ca35e79830173bcb3b91b17aaf360479fb.tar.gz tmwa-e1c116ca35e79830173bcb3b91b17aaf360479fb.tar.bz2 tmwa-e1c116ca35e79830173bcb3b91b17aaf360479fb.tar.xz tmwa-e1c116ca35e79830173bcb3b91b17aaf360479fb.zip | |
Fix some build bugs in exotic configurations
| -rw-r--r-- | real.make | 6 | ||||
| -rw-r--r-- | src/map/magic.cpp | 2 |
2 files changed, 5 insertions, 3 deletions
@@ -186,7 +186,9 @@ ifeq (${ENABLE_WARNINGS},yes) WARNINGS := -include ${SRC_DIR}/src/warnings.hpp endif ${GEN_DEPENDS} ${GEN_PREPROCESSED} ${GEN_IRS} ${GEN_BITCODES} ${GEN_ASSEMBLED} ${GEN_OBJECTS}: override WARNINGS := -${GEN_DEPENDS} ${GEN_PREPROCESSED} ${GEN_IRS} ${GEN_BITCODES} ${GEN_ASSEMBLED} ${GEN_OBJECTS}: override CPPFLAGS += -I ${SRC_DIR}/$(patsubst obj/%,src/%,${@D}) +# can't just override for generated objects, +# because a generated header might be used for a non-generated object. +override CPPFLAGS += -I ${SRC_DIR}/$(patsubst obj/%,src/%,${@D}) # related to gdb bug 15801 ifeq (${ENABLE_ABI6},yes) @@ -239,7 +241,7 @@ obj/%.d: src/%.cpp $(MKDIR_FIRST) set -o pipefail; \ ${CXX} ${CPPFLAGS} ${CXXFLAGS} -MG -MP -MM $< \ - -MT '$@ $(patsubst %.d,%.o,$@)' \ + -MT '$(patsubst %.d,%.ii,$@) $(patsubst %.d,%.ll,$@) $(patsubst %.d,%.bc,$@) $(patsubst %.d,%.s,$@) $(patsubst %.d,%.o,$@) $@' \ | sed -e ':again; s:/[^/ ]*/../:/:; t again' \ -e 's: ${SRC_DIR}/: :g' \ > $@ diff --git a/src/map/magic.cpp b/src/map/magic.cpp index b6dc806..84d133a 100644 --- a/src/map/magic.cpp +++ b/src/map/magic.cpp @@ -9,7 +9,7 @@ #include "magic-expr.hpp" #include "magic-interpreter-base.hpp" #include "magic-interpreter-lexer.hpp" -#include "magic-interpreter-parser.hpp" +#include "src/map/magic-interpreter-parser.hpp" #include "magic-stmt.hpp" #include "magic.hpp" |