gcc_defaults.mak (speech_tools-2.4-release) | : | gcc_defaults.mak (speech_tools-2.5.0-release) | ||
---|---|---|---|---|
skipping to change at line 51 | skipping to change at line 51 | |||
CC=gcc | CC=gcc | |||
CXX=gcc | CXX=gcc | |||
ifeq ($(OSTYPE),Darwin) | ifeq ($(OSTYPE),Darwin) | |||
CXX=g++ | CXX=g++ | |||
endif | endif | |||
COMPILER_DESC=FSF gcc | COMPILER_DESC=FSF gcc | |||
COMPILER_VERSION_COMMAND=$(CXX) -v 2>&1 | tail -1 | sed -e 's/^....//' | COMPILER_VERSION_COMMAND=$(CXX) -v 2>&1 | tail -1 | sed -e 's/^....//' | |||
CFLAGS = $(GCC_SYSTEM_OPTIONS) $(CC_OTHER_FLAGS) | CFLAGS = $(GCC_SYSTEM_OPTIONS) $(CC_OTHER_FLAGS) | |||
CXXFLAGS = $(GCC_SYSTEM_OPTIONS) -fno-implicit-templates $(CC_OTHER_FLAGS) | CXXFLAGS = $(GCC_SYSTEM_OPTIONS) -fno-implicit-templates $(CC_OTHER_FLAGS) $(O MP_OPTS) $(OMP_DEFS) | |||
DEBUG_CCFLAGS = -g | DEBUG_CCFLAGS = -g | |||
DEBUG_CXXFLAGS = -g | DEBUG_CXXFLAGS = -g | |||
DEBUG_LINKFLAGS = -g | DEBUG_LINKFLAGS = -g | |||
WARN_CCFLAGS = -Wall | WARN_CCFLAGS = -Wall | |||
WARN_CXXFLAGS = -Wall | WARN_CXXFLAGS = -Wall | |||
WARN_LINKFLAGS = -Wall | WARN_LINKFLAGS = -Wall | |||
VERBOSE_CCFLAGS = | VERBOSE_CCFLAGS = | |||
skipping to change at line 84 | skipping to change at line 84 | |||
PROFILE_gprof_CCFLAGS = -pg | PROFILE_gprof_CCFLAGS = -pg | |||
PROFILE_gprof_CXXFLAGS = -pg | PROFILE_gprof_CXXFLAGS = -pg | |||
PROFILE_gprof_LINKFLAGS = -pg | PROFILE_gprof_LINKFLAGS = -pg | |||
SHARED_CCFLAGS = -fPIC | SHARED_CCFLAGS = -fPIC | |||
SHARED_CXXFLAGS = -fPIC | SHARED_CXXFLAGS = -fPIC | |||
SHARED_LINKFLAGS = | SHARED_LINKFLAGS = | |||
ifndef GCC_MAKE_SHARED_LIB | ifndef GCC_MAKE_SHARED_LIB | |||
MAKE_SHARED_LIB = $(CXX) -shared -fno-shared-data -o XXX | # Older versions of gcc might have required -fno-shared-data | |||
# MAKE_SHARED_LIB = $(CXX) -shared -fno-shared-data -o XXX | ||||
MAKE_SHARED_LIB = $(CXX) -shared -o XXX | ||||
else | else | |||
MAKE_SHARED_LIB = $(GCC_MAKE_SHARED_LIB) | MAKE_SHARED_LIB = $(GCC_MAKE_SHARED_LIB) | |||
endif | endif | |||
#-shared -R$(MAIN_LIBRARY_DIR) | #-shared -R$(MAIN_LIBRARY_DIR) | |||
STATIC_CCFLAGS = | STATIC_CCFLAGS = | |||
STATIC_CXXFLAGS = | STATIC_CXXFLAGS = | |||
STATIC_LINKFLAGS = -static | STATIC_LINKFLAGS = -static | |||
TEMPLATE_SPECIFIC = -DINSTANTIATE_TEMPLATES | TEMPLATE_SPECIFIC = -DINSTANTIATE_TEMPLATES | |||
TEMPLATE_ARGS = | TEMPLATE_ARGS = | |||
## The -lgcc here is redundant - gcc does this anyway - but it | ## The -lgcc here is redundant - gcc does this anyway - but it | |||
## helps java know what needs to be loaded. | ## helps java know what needs to be loaded. | |||
COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%) -lstdc++ | COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%) -lstdc++ $(OMP_OPTS) | |||
## special ways of doing things, blank means default | ## special ways of doing things, blank means default | |||
MAKE_DEPEND_C = $(CC) -MM $(INCLUDES) $(TEMPLATES) $(TEMPLATE_SPECIFIC) | MAKE_DEPEND_C = $(CC) -MM $(INCLUDES) $(TEMPLATES) $(TEMPLATE_SPECIFIC) | |||
MAKE_DEPEND_CXX = $(CC) -MM $(INCLUDES) $(TEMPLATES) $(TEMPLATE_SPECIFIC) | MAKE_DEPEND_CXX = $(CC) -MM $(INCLUDES) $(TEMPLATES) $(TEMPLATE_SPECIFIC) | |||
BUILD_LIB = $(AR) cruv | BUILD_LIB = $(AR) cruv | |||
INDEX_LIB = $(RANLIB) | INDEX_LIB = $(RANLIB) | |||
End of changes. 3 change blocks. | ||||
3 lines changed or deleted | 5 lines changed or added |