Changeset - r17419:c35536c1a16e
[Not reviewed]
master
0 2 0
glx - 14 years ago 2011-03-04 00:27:17
glx@openttd.org
(svn r22180) -Fix: when using -static-libgcc, also use -static-libstdc++
2 files changed with 3 insertions and 3 deletions:
0 comments (0 inline, 0 general)
Makefile.setting.in
Show inline comments
 
@@ -44,10 +44,10 @@ string.o: $(SRC_DIR)/string.cpp endian_h
 
	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
 

	
 
ini_load.o: $(SRC_DIR)/ini_load.cpp $(SRC_DIR)/core/alloc_func.hpp $(SRC_DIR)/core/mem_func.hpp $(SRC_DIR)/ini_type.h $(SRC_DIR)/string_func.h
 
	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/misc/%.cpp=%.cpp)'
 
	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
 
	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
 

	
 
$(SETTINGSGEN): alloc_func.o ini_load.o settingsgen.o getoptdata.o string.o
 
$(SETTINGSGEN): alloc_func.o string.o ini_load.o settingsgen.o getoptdata.o
 
	$(E) '$(STAGE) Compiling and Linking $@'
 
	$(Q)$(CXX_BUILD) $(LDFLAGS_BUILD) $^ -o $@
 

	
config.lib
Show inline comments
 
@@ -1420,7 +1420,7 @@ make_cflags_and_ldflags() {
 
			LIBS="$LIBS -lws2_32 -lwinmm -lgdi32 -ldxguid -lole32"
 

	
 
			if [ $cc_version -ge 44 ]; then
 
				LDFLAGS_BUILD="$LDFLAGS_BUILD -static-libgcc"
 
				LDFLAGS_BUILD="$LDFLAGS_BUILD -static-libgcc -static-libstdc++"
 
			fi
 
		fi
 
	fi
0 comments (0 inline, 0 general)