diff options
| author | Joerg Koenig <Joerg.Koenig@techsat.com> | 2019-05-12 20:06:22 (GMT) |
|---|---|---|
| committer | Joerg Koenig <Joerg.Koenig@techsat.com> | 2019-05-12 20:06:22 (GMT) |
| commit | 651525b31431a0bba8ba94e9d02ab97695946ee0 (patch) | |
| tree | 5488e3af7b0e8a00045c5dd55ad8010ca90acee1 | |
| parent | 62cd85cf2e14c4f451130976d27697b625959d09 (diff) | |
| download | Qt-651525b31431a0bba8ba94e9d02ab97695946ee0.zip Qt-651525b31431a0bba8ba94e9d02ab97695946ee0.tar.gz Qt-651525b31431a0bba8ba94e9d02ab97695946ee0.tar.bz2 | |
Fixed working directories
Change-Id: Ie5b7026cb39099f0e670a83da62953293c9b813b
| -rw-r--r-- | Makefile | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -18,8 +18,8 @@ PACKAGE_NAME = qt-$(VERSION) GCC_PATH = /opt/dev-tools/gcc/8.2.0/x86-linux64/gcc-8.2.0 -CC = gcc-7 # "-m64 -static-libgcc -nodefaultlibs" -CXX = g++-7 #"-m64 -static-libgcc -static-libstdc++ -nodefaultlibs" +CC ?= gcc-7 # "-m64 -static-libgcc -nodefaultlibs" +CXX ?= g++-7 #"-m64 -static-libgcc -static-libstdc++ -nodefaultlibs" CC_LDFLAGS = "-m64 -static-libgcc -nodefaultlibs" CXX_LDFLAGS_ = "-m64 -static-libgcc -static-libstdc++ -nodefaultlibs" QT_STATIC_FLAGS = -static -static-runtime -no-shared @@ -72,7 +72,6 @@ qt.x86-linux64.shared: export LDFLAGS=$(CXX_LDFLAGS) && \ bash ./configure \ -recheck-all \ - -platfrom linux-clang \ -prefix $(LOCAL_INST_PATH)/qt-$(VERSION)-shared \ -release \ -opensource \ @@ -93,7 +92,7 @@ qt.x86-linux64.shared: -fontconfig \ -system-freetype \ -confirm-license && \ - make -j$(JOBS) && \ + make -j$(JOBS) CC=$(CC) CXX=$(CXX) LFLAGS=$(CXX_LDFLAGS) && \ make -j$(JOBS) install cd $(LOCAL_INST_PATH)/qt-$(VERSION)-shared && \ tar -zcf $(TOP)/qt-$(VERSION)-shared-$(ARCH).tgz ./ @@ -110,7 +109,6 @@ qt.x86-linux64.static: export LDFLAGS=$(CXX_LDFLAGS) && \ bash ./configure \ -recheck-all \ - -platfrom linux-clang \ -prefix $(LOCAL_INST_PATH)/qt-$(VERSION)-static \ -static \ -release \ @@ -132,7 +130,7 @@ qt.x86-linux64.static: -fontconfig \ -system-freetype \ -confirm-license && \ - make -j$(JOBS) && \ + make -j$(JOBS) CC=$(CC) CXX=$(CXX) LFLAGS=$(CXX_LDFLAGS) && \ make -j$(JOBS) install cd $(LOCAL_INST_PATH)/qt-$(VERSION)-static && \ tar -zcf $(TOP)/qt-$(VERSION)-static-$(ARCH).tgz ./ |