diff options
| author | Koenig, Joerg <Joerg.Koenig@techsat.com> | 2019-10-31 09:18:48 (GMT) |
|---|---|---|
| committer | Koenig, Joerg <Joerg.Koenig@techsat.com> | 2019-10-31 09:18:48 (GMT) |
| commit | 45a2a4d8ddd82bbbe825672655c41188dc6141c2 (patch) | |
| tree | 5de56cf4a58e533eadb138a6cd9c9fe7cc3c121a /Makefile | |
| parent | 05913e6bd84a963215885319a55ee019a79be482 (diff) | |
| download | Qt-45a2a4d8ddd82bbbe825672655c41188dc6141c2.zip Qt-45a2a4d8ddd82bbbe825672655c41188dc6141c2.tar.gz Qt-45a2a4d8ddd82bbbe825672655c41188dc6141c2.tar.bz2 | |
Revert "Link always with -static-libgcc -static-libstdc++"
This reverts commit 73245e551e6bad72110383f8cd5eb85ba956854d.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 14 |
1 files changed, 6 insertions, 8 deletions
@@ -41,10 +41,10 @@ ssl.$(ARCH): tar -xzf $(TOP)/SOURCE/$(SSL_ARCHIVE) cd $(LOCAL_BUILD_PATH)/openssl-$(SSL_VERSION) && \ export CFLAGS= && \ - export LDFLAGS="-static-libgcc -static-libstdc++" && \ + export LDFLAGS=$(CC_LDFLAGS) && \ export PATH=$(GCC_PATH)/bin:$(PATH) && \ export LD_LIBRARY_PATH=$(GCC_PATH)/lib64:$(LD_LIBRARY_PATH) && \ - ./Configure -static-libgcc -static-libstdc++ --prefix=$(LOCAL_INST_PATH)/openssl linux-generic64 && \ + ./Configure --prefix=$(LOCAL_INST_PATH)/openssl linux-generic64 && \ pwd && \ make clean && \ make $(JOBS) && \ @@ -56,10 +56,10 @@ ssl.$(ARCH): tar -xzf $(TOP)/SOURCE/$(SSL_ARCHIVE) cd $(LOCAL_BUILD_PATH)/openssl-$(SSL_VERSION) && \ export CFLAGS=-fpic && \ - export LDFLAGS="-static-libgcc -static-libstdc++" && \ + export LDFLAGS=$(CC_LDFLAGS) && \ export PATH=$(GCC_PATH)/bin:$(PATH) && \ export LD_LIBRARY_PATH=$(GCC_PATH)/lib64:$(LD_LIBRARY_PATH) && \ - ./Configure -static-libgcc -static-libstdc++ shared --prefix=$(LOCAL_INST_PATH)/openssl linux-generic64 && \ + ./Configure shared --prefix=$(LOCAL_INST_PATH)/openssl linux-generic64 && \ pwd && \ make clean && \ make $(JOBS) && \ @@ -74,8 +74,7 @@ qt.x86-linux64.shared: cd $(LOCAL_BUILD_PATH) && \ tar -xJf $(TOP)/SOURCE/qt-everywhere-src-$(VERSION).tar.xz cd $(LOCAL_BUILD_PATH)/qt-everywhere-src-$(VERSION) && \ - patch -p1 < $(TOP)/SOURCE/qt-5.12.3-linux-static-gcc-libs.patch && \ - rm -f config.cache && \ + rm -f config.cache && \ export LDFLAGS=$(CXX_LDFLAGS) && \ export PATH=$(GCC_PATH)/bin:$(PATH) && \ export LD_LIBRARY_PATH=$(GCC_PATH)/lib64:$(LD_LIBRARY_PATH) && \ @@ -117,8 +116,7 @@ qt.x86-linux64.static: cd $(LOCAL_BUILD_PATH) && \ tar -xJf $(TOP)/SOURCE/qt-everywhere-src-$(VERSION).tar.xz cd $(LOCAL_BUILD_PATH)/qt-everywhere-src-$(VERSION) && \ - patch -p1 < $(TOP)/SOURCE/qt-5.12.3-linux-static-gcc-libs.patch && \ - rm -f config.cache && \ + rm -f config.cache && \ export PATH=$(GCC_PATH)/bin:$(PATH) && \ export LD_LIBRARY_PATH=$(GCC_PATH)/lib64:$(LD_LIBRARY_PATH) && \ gcc --version && \ |