Просмотр исходного кода

* Move -no-integrated-cpp to global CXX

It's only needed for the production build. Additionally, ccache is
already causing a 2-pass compile due to depcomp adding -MD. The -MD
forces ccache into "preprocessor" mode. The -no-integrated-cpp flag
is technically only needed when not using ccache, or when not using
depcomp with ccache.
Bryan Drewery 14 лет назад
Родитель
Сommit
d4b79505bd
2 измененных файлов с 2 добавлено и 2 удалено
  1. 1 1
      Makefile.in
  2. 1 1
      build/build.mk.in

+ 1 - 1
Makefile.in

@@ -30,7 +30,7 @@ SETTINGSFILE = doc/settings.txt
 RESPONSESFILE = doc/responses.txt
 
 # defaults
-CXX = @CCACHE@ @DISTCC@ @CXX@ @STATIC@
+CXX = @CCACHE@ @DISTCC@ @CXX@ @STATIC@ -no-integrated-cpp
 LD_DYNAMIC = @CXX@
 LD_STATIC = @CXX@ @STATIC@
 CCDEBUG = @CCACHE@ @DISTCC@ @CXX@

+ 1 - 1
build/build.mk.in

@@ -4,5 +4,5 @@ depcomp = /bin/sh $(top_srcdir)/build/autotools/depcomp
 	@echo -e "Compiling: \033[1m`basename $< .c`\033[0m"
 	# STRINGFIX included after CXX for ccache to recognize
 	stringfix="$(top_srcdir)/$(STRINGFIX)" source='$<' object='$@' depfile='.deps/$*.Po' tmpdepfile='.deps/$*.TPo' depmode=$(CCDEPMODE) $(depcomp) \
-	$(CXX) -DSTRINGFIX=$(STRINGFIX) -no-integrated-cpp -B$(top_srcdir)/build $(CXXFLAGS) $(CPPFLAGS) -c $<  -o `basename $< .c`.o
+	$(CXX) -DSTRINGFIX=$(STRINGFIX) -B$(top_srcdir)/build $(CXXFLAGS) $(CPPFLAGS) -c $<  -o `basename $< .c`.o