Kaynağa Gözat

Merge branch 'maint'

* maint:
  Don't hide errors building symbols and be sure to pass in proper -std
  Remove defunct MAKE_UTILS_NR

Conflicts:
	Makefile.in
	build/autotools/configure.ac
	configure
Bryan Drewery 11 yıl önce
ebeveyn
işleme
4c9b26589a
1 değiştirilmiş dosya ile 0 ekleme ve 4 silme
  1. 0 4
      Makefile.in

+ 0 - 4
Makefile.in

@@ -64,10 +64,6 @@ MAKE_UTILS = $(MAKE) 'MAKE=$(MAKE)' 'CXX=$(CXX)' 'CC=$(CC)' 'STRIP=touch' 'INCLU
 'CCDEPMODE=$(CCDEPMODE)' \
 'CXXFLAGS=$(CXXFLAGS) $(DEBCXXFLAGS)' 'CFLGS=$(CFLGS) $(DEBCXXFLAGS)' 'LIBS=$(LIBS)' 'LD=$(LD_DEBUG) -g'
 
-MAKE_UTILS_NR = $(MAKE) 'CXX=$(CXX)' 'CC=$(CC)' 'STRIP=touch' 'INCLUDES=$(INCLUDES)' \
-'CCDEPMODE=$(CCDEPMODE)' \
-'CXXFLAGS=$(CXXFLAGS) $(DEBCXXFLAGS)' 'CFLGS=$(CFLGS) $(DEBCXXFLAGS)' 'LIBS=$(LIBS)' 'LD=$(LD_DYNAMIC) -g'
-
 MAKE_CONFIG = $(MAKE) 'MAKE=$(MAKE)'
 
 .PHONY: checkclean.static checkclean.dynamic checkclean.debug lib wraith dwraith lib.debug debug test general sorthelp sort indent tar distrib distclean clean cleanutils test all dynamic static tags