diff options
| author | rubidium <rubidium@openttd.org> | 2009-06-22 20:22:04 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-06-22 20:22:04 +0000 |
| commit | 952f74086600de7088744b933e9b1f51019caa84 (patch) | |
| tree | 6b6e02a8069701316f26cf14b0681c25e48785f9 /Makefile.src.in | |
| parent | 95a1bbdd7dc15311cf68faf8705a1ea80b0868fd (diff) | |
| download | openttd-952f74086600de7088744b933e9b1f51019caa84.tar.xz | |
(svn r16623) -Change: remove CC_CFLAGS as we're not using a C compiler anywhere at all
Diffstat (limited to 'Makefile.src.in')
| -rw-r--r-- | Makefile.src.in | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/Makefile.src.in b/Makefile.src.in index 044aea3a6..78150f1ad 100644 --- a/Makefile.src.in +++ b/Makefile.src.in @@ -4,7 +4,6 @@ CC_BUILD = !!CC_BUILD!! CXX_BUILD = !!CXX_BUILD!! WINDRES = !!WINDRES!! STRIP = !!STRIP!! -CC_CFLAGS = !!CC_CFLAGS!! CFLAGS = !!CFLAGS!! CFLAGS_BUILD = !!CFLAGS_BUILD!! LIBS = !!LIBS!! @@ -100,7 +99,7 @@ REV_NR := 0 endif # This helps to recompile if flags change -RES := $(shell if [ "`cat $(CONFIG_CACHE_COMPILER) 2>/dev/null`" != "$(CC_CFLAGS) $(CFLAGS)" ]; then echo "$(CC_CFLAGS) $(CFLAGS)" > $(CONFIG_CACHE_COMPILER); fi ) +RES := $(shell if [ "`cat $(CONFIG_CACHE_COMPILER) 2>/dev/null`" != "$(CFLAGS)" ]; then echo "$(CFLAGS)" > $(CONFIG_CACHE_COMPILER); fi ) RES := $(shell if [ "`cat $(CONFIG_CACHE_LINKER) 2>/dev/null`" != "$(LDFLAGS) $(LIBS)" ]; then echo "$(LDFLAGS) $(LIBS)" > $(CONFIG_CACHE_LINKER); fi ) RES := $(shell if [ "`cat $(CONFIG_CACHE_ENDIAN) 2>/dev/null`" != "$(ENDIAN_FORCE)" ]; then echo "$(ENDIAN_FORCE)" > $(CONFIG_CACHE_ENDIAN); fi ) @@ -127,10 +126,6 @@ endif # Find the deps via GCC. Rarely wrong, but a bit slow -$(OBJS_C:%.o=%.d): %.d: $(SRC_DIR)/%.c $(FILE_DEP) - $(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.c=%.c)' - $(Q)$(CC_HOST) $(CC_CFLAGS) $(CFLAGS) -MM $< | sed 's@^$(@F:%.d=%.o):@$@ $(@:%.d=%.o):@' > $@ - $(OBJS_CPP:%.o=%.d): %.d: $(SRC_DIR)/%.cpp $(FILE_DEP) $(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.cpp=%.cpp)' $(Q)$(CXX_HOST) $(CFLAGS) -MM $< | sed 's@^$(@F:%.d=%.o):@$@ $(@:%.d=%.o):@' > $@ @@ -219,10 +214,6 @@ endif # Compile all the files according to the targets -$(OBJS_C): %.o: $(SRC_DIR)/%.c $(DEP_MASK) $(FILE_DEP) - $(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.c=%.c)' - $(Q)$(CC_HOST) $(CC_CFLAGS) $(CFLAGS) -c -o $@ $< - $(OBJS_CPP): %.o: $(SRC_DIR)/%.cpp $(DEP_MASK) $(FILE_DEP) $(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)' $(Q)$(CXX_HOST) $(CFLAGS) -c -o $@ $< |