summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile10
1 files changed, 4 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 3dd6c1e..561368c 100644
--- a/Makefile
+++ b/Makefile
@@ -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 ./