This patch is part of a series of patches for speech-tools for Debian GNU/Linux, which primarily fix build errors with GCC 4.3 and newer. Index: speech-tools/config/compilers/gcc_defaults.mak =================================================================== --- speech-tools.orig/config/compilers/gcc_defaults.mak 2010-02-03 06:28:14.000000000 -0600 +++ speech-tools/config/compilers/gcc_defaults.mak 2010-07-17 08:18:11.000000000 -0500 @@ -39,7 +39,7 @@ ########################################################################### CC=gcc -CXX=gcc +CXX=g++ ifeq ($(OSTYPE),Darwin) CXX=g++ endif @@ -48,7 +48,7 @@ COMPILER_VERSION_COMMAND=$(CXX) -v 2>&1 | tail -1 | sed -e 's/^....//' CFLAGS = $(GCC_SYSTEM_OPTIONS) $(CC_OTHER_FLAGS) -CXXFLAGS = $(GCC_SYSTEM_OPTIONS) -fno-implicit-templates $(CC_OTHER_FLAGS) +CXXFLAGS = $(GCC_SYSTEM_OPTIONS) $(CC_OTHER_FLAGS) DEBUG_CCFLAGS = -g DEBUG_CXXFLAGS = -g @@ -81,7 +81,7 @@ SHARED_LINKFLAGS = ifndef GCC_MAKE_SHARED_LIB - MAKE_SHARED_LIB = $(CXX) -shared -fno-shared-data -o XXX + MAKE_SHARED_LIB = $(CXX) -shared -o XXX else MAKE_SHARED_LIB = $(GCC_MAKE_SHARED_LIB) endif @@ -98,7 +98,7 @@ ## The -lgcc here is redundant - gcc does this anyway - but it ## helps java know what needs to be loaded. -COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%) -lstdc++ -lgcc +COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%) -lgcc ## special ways of doing things, blank means default