diff options
| author | Koenig, Joerg <Joerg.Koenig@techsat.com> | 2019-10-31 09:51:10 (GMT) |
|---|---|---|
| committer | Koenig, Joerg <Joerg.Koenig@techsat.com> | 2019-10-31 09:51:10 (GMT) |
| commit | a7acad50257a0b8ea1c7f5c809b1e502e5131f48 (patch) | |
| tree | 90ee37e44c921f691fa3296508856f2365110552 | |
| parent | 11c4b06d74eb553a39198cef17935849ad5118bd (diff) | |
| download | Qt-a7acad50257a0b8ea1c7f5c809b1e502e5131f48.zip Qt-a7acad50257a0b8ea1c7f5c809b1e502e5131f48.tar.gz Qt-a7acad50257a0b8ea1c7f5c809b1e502e5131f48.tar.bz2 | |
Revert "Option --force-local not supported on windows"
This reverts commit 64120e6364f47292de98edeb2eae87294e083289.
| -rw-r--r-- | Makefile.mingw64 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.mingw64 b/Makefile.mingw64 index d7cc664..717f305 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 -xzf $(TOP)/SOURCE/$(SSL_ARCHIVE) + tar --force-local -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 -xJf $(TOP)/SOURCE/qt-everywhere-src-$(VERSION).tar.xz; \ + tar --force-local -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 |