From 0eb8afa826bddb165f5f2a5440c0ca147d351784 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Thu, 7 Oct 2021 11:09:11 +0200 Subject: Makefile: Also passthrough LD and AR to gui/build.sh Signed-off-by: Andrew Ammerlaan --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 81d3821..d7022a3 100644 --- a/Makefile +++ b/Makefile @@ -108,7 +108,7 @@ PKGFILES = $(shell find pkg -type f -name '*.go') endif lib/%.a: $(PKGFILES) - @XBUILD=no CC=${CC} CXX=${CXX} MAKE=${MAKE} ./gui/build.sh --just-golib + @XBUILD=no CC=${CC} CXX=${CXX} MAKE=${MAKE} AR=${AR} LD=${LD} ./gui/build.sh --just-golib relink_vendor: @echo "============RELINK VENDOR=============" @@ -140,7 +140,7 @@ build_gui: build_golib relink_vendor @echo "==============BUILD GUI===============" @echo "TARGET: ${TARGET}" @echo "VENDOR_PATH: ${VENDOR_PATH}" - @XBUILD=no CC=${CC} CXX=${CXX} MAKE=${MAKE} QMAKE=${QMAKE} LRELEASE=${LRELEASE} TARGET=${TARGET} VENDOR_PATH=${VENDOR_PATH} APPNAME=${APPNAME} gui/build.sh --skip-golib + @XBUILD=no CC=${CC} CXX=${CXX} MAKE=${MAKE} AR=${AR} LD=${LD} QMAKE=${QMAKE} LRELEASE=${LRELEASE} TARGET=${TARGET} VENDOR_PATH=${VENDOR_PATH} APPNAME=${APPNAME} gui/build.sh --skip-golib @echo "============BUILD GUI=================" build: build_helper build_gui -- cgit v1.2.3