diff --git a/base-linux/lib/import/import-lx_hybrid.mk b/base-linux/lib/import/import-lx_hybrid.mk index 1abc38c75..2bc5d2f6f 100644 --- a/base-linux/lib/import/import-lx_hybrid.mk +++ b/base-linux/lib/import/import-lx_hybrid.mk @@ -102,3 +102,6 @@ endif # because we use the host compiler's libgcc, omit the Genode toolchain's version LD_LIBGCC = + +# use the host c++ for linking to find shared libraries in DT_RPATH library paths +LD_CMD = c++ diff --git a/base/mk/prg.mk b/base/mk/prg.mk index 2eec9dd67..2ffe23499 100644 --- a/base/mk/prg.mk +++ b/base/mk/prg.mk @@ -106,7 +106,9 @@ SHARED_LIBS := $(sort $(wildcard $(SHARED_LIBS))) # # Use CXX for linking # -LD_CMD := $(CXX) $(CXX_LINK_OPT) +LD_CMD ?= $(CXX) + +LD_CMD += $(CXX_LINK_OPT) ifeq ($(SHARED_LIBS),) LD_SCRIPTS := $(LD_SCRIPT_STATIC)