ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-01-18 02:40:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace ENV make variable with MKENV.

Browse Source 
ENV variable conflicts with Environment Modules.

Signed-off-by: Oleg Girko <ol@infoserver.lv>

Fixes #3535
This commit is contained in:
Oleg Girko 2019-03-04 01:24:10 +00:00 committed by Christian Helmuth
parent 8a8aa85726
commit c589660182
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
repos/ports/mk/gnu_build.mk
View File

@ -145,7 +145,7 @@ Makefile reconfigure: $(MAKEFILE_LIST)
#
Makefile reconfigure: env.sh $(SHARED_LIBS)
@$(MSG_CONFIG)$(TARGET)
$(VERBOSE)source env.sh && $(CONFIGURE_SCRIPT) $(ENV) $(CONFIGURE_ARGS) $(CONFIGURE_OUTPUT_FILTER)
$(VERBOSE)source env.sh && $(CONFIGURE_SCRIPT) $(MKENV) $(CONFIGURE_ARGS) $(CONFIGURE_OUTPUT_FILTER)
env.sh:
$(VERBOSE)rm -f $@

4
repos/ports/src/noux-pkg/binutils/target.inc
View File

@ -7,9 +7,9 @@ CONFIGURE_ARGS = --disable-werror \
#
# Pass CFLAGS and friends to the invokation of 'make' because
# binutils execute 2nd-level configure scripts, which need
# the 'ENV' as well.
# the 'MKENV' as well.
#
MAKE_ENV = $(ENV)
MAKE_ENV = $(MKENV)
PKG_DIR = $(call select_from_ports,binutils)/src/noux-pkg/binutils

8
repos/ports/src/noux-pkg/gcc/target.inc
View File

@ -22,17 +22,17 @@ CONFIGURE_ARGS = --program-prefix=$(PROGRAM_PREFIX) \
--disable-sjlj-exceptions \
--disable-nls
ENV += host_configargs="$(HOST_CONFIG_ARGS)" \
MKENV += host_configargs="$(HOST_CONFIG_ARGS)" \
target_configargs="$(TARGET_CONFIG_ARGS)"
ENV += CC_FOR_TARGET=$(CC) CXX_FOR_TARGET=$(CXX) GCC_FOR_TARGET=$(CC) CPP_FOR_TARGET="$(CC) -E" \
MKENV += CC_FOR_TARGET=$(CC) CXX_FOR_TARGET=$(CXX) GCC_FOR_TARGET=$(CC) CPP_FOR_TARGET="$(CC) -E" \
LD_FOR_TARGET=$(LD) AS_FOR_TARGET=$(AS) AR_FOR_TARGET=$(AR)
# libgcc does not evaluate CPPFLAGS_FOR_TARGET, so everything is put into CFLAGS_FOR_TARGET here
ENV += CFLAGS_FOR_TARGET='-I$(BASE_DIR)/../../tool -DUSE_PT_GNU_EH_FRAME -Dinhibit_libc -fPIC'
MKENV += CFLAGS_FOR_TARGET='-I$(BASE_DIR)/../../tool -DUSE_PT_GNU_EH_FRAME -Dinhibit_libc -fPIC'
# libsupc++
ENV += CXXFLAGS_FOR_TARGET='-fPIC'
MKENV += CXXFLAGS_FOR_TARGET='-fPIC'
MAKE_ENV += GENODE="yes"