summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoenig, Joerg <Joerg.Koenig@techsat.com>2019-10-29 09:36:43 (GMT)
committerKoenig, Joerg <Joerg.Koenig@techsat.com>2019-10-29 09:36:43 (GMT)
commit64120e6364f47292de98edeb2eae87294e083289 (patch)
tree3b9b01988ef216c44286a32b11b5a8f84d4b1662
parent14cfb648a2a4b7228a6e215f23da03f1832ab5ea (diff)
downloadQt-64120e6364f47292de98edeb2eae87294e083289.zip
Qt-64120e6364f47292de98edeb2eae87294e083289.tar.gz
Qt-64120e6364f47292de98edeb2eae87294e083289.tar.bz2
Option --force-local not supported on windows
Change-Id: I8cbe24e0fa3dd75d49596209bd505084059f00ea
-rw-r--r--Makefile.mingw644
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.mingw64 b/Makefile.mingw64
index 717f305..d7cc664 100644
--- a/Makefile.mingw64
+++ b/Makefile.mingw64
@@ -34,7 +34,7 @@ ssl.$(ARCH):
rm -Rf $(LOCAL_BUILD_PATH)/openssl-$(SSL_VERSION)
mkdir -p $(LOCAL_BUILD_PATH)/
cd $(LOCAL_BUILD_PATH) && \
- tar --force-local -xzf $(TOP)/SOURCE/$(SSL_ARCHIVE)
+ tar -xzf $(TOP)/SOURCE/$(SSL_ARCHIVE)
cd $(LOCAL_BUILD_PATH)/openssl-$(SSL_VERSION) && \
export CFLAGS="-m64 -fpic" && \
./Configure --prefix=$(QT_INST_PATH) shared mingw64 && \
@@ -47,7 +47,7 @@ qt.$(ARCH):
rm -Rf $(LOCAL_BUILD_PATH)/qt-everywhere-src-$(VERSION)
if ! [ -d $(LOCAL_BUILD_PATH)/qt-everywhere-src-$(VERSION) ]; then \
cd $(LOCAL_BUILD_PATH); \
- tar --force-local -xJf $(TOP)/SOURCE/qt-everywhere-src-$(VERSION).tar.xz; \
+ 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-cross-static-gcc-libs.patch ; \
fi