diff --git a/base/mk/global.mk b/base/mk/global.mk index 9cd9a04b93..e9eac825b5 100644 --- a/base/mk/global.mk +++ b/base/mk/global.mk @@ -19,6 +19,7 @@ CUSTOM_AS ?= $(CROSS_DEV_PREFIX)as CUSTOM_AR ?= $(CROSS_DEV_PREFIX)ar CUSTOM_NM ?= $(CROSS_DEV_PREFIX)nm CUSTOM_OBJCOPY ?= $(CROSS_DEV_PREFIX)objcopy +CUSTOM_RANLIB ?= $(CROSS_DEV_PREFIX)ranlib CUSTOM_STRIP ?= $(CROSS_DEV_PREFIX)strip # @@ -42,6 +43,7 @@ AS = $(CUSTOM_AS) AR = $(CUSTOM_AR) NM = $(CUSTOM_NM) OBJCOPY = $(CUSTOM_OBJCOPY) +RANLIB = $(CUSTOM_RANLIB) STRIP = $(CUSTOM_STRIP) # diff --git a/ports/mk/noux.mk b/ports/mk/noux.mk index 5c24674e4c..f8918bea31 100644 --- a/ports/mk/noux.mk +++ b/ports/mk/noux.mk @@ -111,7 +111,7 @@ NOUX_LIBS_A = $(filter %.a, $(sort $(LINK_ITEMS)) $(EXT_OBJECTS) $(LIBGCC)) NOUX_LIBS_SO = $(filter %.so,$(sort $(LINK_ITEMS)) $(EXT_OBJECTS) $(LIBGCC)) NOUX_LIBS += $(NOUX_LIBS_A) $(NOUX_LIBS_SO) $(NOUX_LIBS_A) -NOUX_ENV += CC='$(CC)' CXX='$(CXX)' LD='$(LD)' AR='$(AR)' STRIP='$(STRIP)' LIBS='$(NOUX_LIBS)' \ +NOUX_ENV += CC='$(CC)' CXX='$(CXX)' LD='$(LD)' AR='$(AR)' NM='$(NM)' RANLIB='$(RANLIB)' STRIP='$(STRIP)' LIBS='$(NOUX_LIBS)' \ LDFLAGS='$(NOUX_LDFLAGS)' CFLAGS='$(NOUX_CFLAGS)' \ CPPFLAGS='$(NOUX_CPPFLAGS)' CXXFLAGS='$(NOUX_CXXFLAGS)' @@ -135,8 +135,11 @@ noux_env.sh: $(VERBOSE)rm -f $@ $(VERBOSE)echo "export CC='$(CC)'" >> $@ $(VERBOSE)echo "export CXX='$(CXX)'" >> $@ - $(VERBOSE)echo "export AR='$(AR)'" >> $@ $(VERBOSE)echo "export LD='$(LD)'" >> $@ + $(VERBOSE)echo "export AR='$(AR)'" >> $@ + $(VERBOSE)echo "export NM='$(NM)'" >> $@ + $(VERBOSE)echo "export RANLIB='$(RANLIB)'" >> $@ + $(VERBOSE)echo "export STRIP='$(STRIP)'" >> $@ $(VERBOSE)echo "export CPPFLAGS='$(NOUX_CPPFLAGS)'" >> $@ $(VERBOSE)echo "export CFLAGS='$(NOUX_CFLAGS)'" >> $@ $(VERBOSE)echo "export CXXFLAGS='$(NOUX_CXXFLAGS)'" >> $@ diff --git a/ports/src/noux-pkg/gcc/target.inc b/ports/src/noux-pkg/gcc/target.inc index 96e4d14901..76beff62de 100644 --- a/ports/src/noux-pkg/gcc/target.inc +++ b/ports/src/noux-pkg/gcc/target.inc @@ -3,7 +3,7 @@ PWD = $(shell pwd) NOUX_CONFIGURE_ARGS = --program-prefix=$(PROGRAM_PREFIX) \ --target=$(GCC_TARGET) \ --with-gnu-as --with-gnu-ld --disable-tls --disable-threads --disable-lto \ - --disable-multilib --disable-shared + --disable-multilib # # Configure options passed to gcc