diff options
| author | glx <glx@openttd.org> | 2011-03-04 00:27:17 +0000 |
|---|---|---|
| committer | glx <glx@openttd.org> | 2011-03-04 00:27:17 +0000 |
| commit | ee1af659a911cc7f971ceea56dafb7d5e92a457d (patch) | |
| tree | 58115d4b10f49ba3c84e3bff892b27195a9cbb49 | |
| parent | ec56036dc7dc74463bd3d1cdb54319832a008c95 (diff) | |
| download | openttd-ee1af659a911cc7f971ceea56dafb7d5e92a457d.tar.xz | |
(svn r22180) -Fix: when using -static-libgcc, also use -static-libstdc++
| -rw-r--r-- | Makefile.setting.in | 4 | ||||
| -rw-r--r-- | config.lib | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.setting.in b/Makefile.setting.in index 7f70bb37a..5566db981 100644 --- a/Makefile.setting.in +++ b/Makefile.setting.in @@ -44,10 +44,10 @@ string.o: $(SRC_DIR)/string.cpp endian_host.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 $@ diff --git a/config.lib b/config.lib index 098db2c63..6fee37cca 100644 --- a/config.lib +++ b/config.lib @@ -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 |