Skip to content
Snippets Groups Projects
Unverified Commit 0eb8afa8 authored by Nowa Ammerlaan's avatar Nowa Ammerlaan
Browse files

Makefile: Also passthrough LD and AR to gui/build.sh

parent c85a9912
No related branches found
No related tags found
No related merge requests found
...@@ -108,7 +108,7 @@ PKGFILES = $(shell find pkg -type f -name '*.go') ...@@ -108,7 +108,7 @@ PKGFILES = $(shell find pkg -type f -name '*.go')
endif endif
lib/%.a: $(PKGFILES) 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: relink_vendor:
@echo "============RELINK VENDOR=============" @echo "============RELINK VENDOR============="
...@@ -140,7 +140,7 @@ build_gui: build_golib relink_vendor ...@@ -140,7 +140,7 @@ build_gui: build_golib relink_vendor
@echo "==============BUILD GUI===============" @echo "==============BUILD GUI==============="
@echo "TARGET: ${TARGET}" @echo "TARGET: ${TARGET}"
@echo "VENDOR_PATH: ${VENDOR_PATH}" @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=================" @echo "============BUILD GUI================="
build: build_helper build_gui build: build_helper build_gui
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment