summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoenig, Joerg <Joerg.Koenig@techsat.com>2020-04-27 05:54:53 (GMT)
committerKoenig, Joerg <Joerg.Koenig@techsat.com>2020-04-27 05:54:53 (GMT)
commit6e24ff1286038ff1a35b34b00eb5fa3cf6b5abb6 (patch)
tree28664baa5a187a2066c11d543d61cac4110d5daf
parentdcbb4ef209fe20fbcac0b176d8cb7f2528b4648a (diff)
downloadQt-6e24ff1286038ff1a35b34b00eb5fa3cf6b5abb6.zip
Qt-6e24ff1286038ff1a35b34b00eb5fa3cf6b5abb6.tar.gz
Qt-6e24ff1286038ff1a35b34b00eb5fa3cf6b5abb6.tar.bz2
Removed -no-rpath from qt configurerefs/changes/93/11093/1
Change-Id: Ica150c5ec70a7b22420577f17cc2af240a6bfd2a
-rw-r--r--Makefile3
-rw-r--r--Makefile.mingw641
-rw-r--r--Makefile.x86-linux2
-rw-r--r--Makefile.xmingw642
4 files changed, 0 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 3286075..79493d3 100644
--- a/Makefile
+++ b/Makefile
@@ -86,9 +86,7 @@ qt.x86-linux64.shared:
-prefix $(LOCAL_INST_PATH)/qt-$(VERSION)-shared \
-release \
-opensource \
- -no-rpath \
-silent \
- -no-rpath \
-strip \
-ssl \
-openssl \
@@ -134,7 +132,6 @@ qt.x86-linux64.static:
-ssl \
-openssl \
-silent \
- -no-rpath \
-I$(LOCAL_INST_PATH)/openssl/include \
-L$(LOCAL_INST_PATH)/opensll/lib \
-L$(GCC_PATH)/lib64 \
diff --git a/Makefile.mingw64 b/Makefile.mingw64
index 37d3fbd..a681087 100644
--- a/Makefile.mingw64
+++ b/Makefile.mingw64
@@ -72,7 +72,6 @@ qt.$(ARCH):
-release \
-strip \
-silent \
- -no-rpath \
-no-pch \
-ssl \
-nomake examples \
diff --git a/Makefile.x86-linux b/Makefile.x86-linux
index 0bc6b0d..7aa0b22 100644
--- a/Makefile.x86-linux
+++ b/Makefile.x86-linux
@@ -87,7 +87,6 @@ qt.x86-linux.shared:
-opensource \
-strip \
-silent \
- -no-rpath \
-ssl \
-openssl \
-I$(LOCAL_INST_PATH)/openssl/include \
@@ -130,7 +129,6 @@ qt.x86-linux.static:
-ssl \
-openssl \
-silent \
- -no-rpath \
-I$(LOCAL_INST_PATH)/openssl/include \
-L$(LOCAL_INST_PATH)/opensll/lib \
-L$(GCC_PATH)/lib \
diff --git a/Makefile.xmingw64 b/Makefile.xmingw64
index 68c1416..1a48e07 100644
--- a/Makefile.xmingw64
+++ b/Makefile.xmingw64
@@ -98,7 +98,6 @@ qt.x86-mingw64.shared:
-prefix $(LOCAL_INST_PATH)/qt-$(VERSION)-shared \
-release \
-opensource \
- -no-rpath \
-strip \
-ssl \
-openssl \
@@ -145,7 +144,6 @@ qt.x86-mingw64.static:
-strip \
-ssl \
-openssl \
- -no-rpath \
-I$(LOCAL_INST_PATH)/openssl/include \
-L$(LOCAL_INST_PATH)/opensll/lib \
-nomake examples \