Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow configuring distinct compilers for OpenJ9 #147

Merged
merged 3 commits into from
Nov 2, 2018
Merged

Allow configuring distinct compilers for OpenJ9 #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f49d33
Cleanup
keithc-ca Oct 18, 2018
80d4a47
Allow configuring distinct compilers for OpenJ9
keithc-ca Oct 18, 2018
9dbbf67
Re-run common/autoconf/autogen.sh
keithc-ca Nov 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions closed/OpenJ9.gmk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,14 +376,16 @@ define create_or_update
fi
endef

ifeq (1,$(OPENJ9_USE_CUSTOM_COMPILER))
SETUP_CUSTOM_COMPILER_ENV_VARS := \
DEVELOPER_DIR="$(OPENJ9_DEVELOPER_DIR)" \
CC="$(OPENJ9_CC)" \
CXX="$(OPENJ9_CXX)" \
#
else
SETUP_CUSTOM_COMPILER_ENV_VARS :=
CUSTOM_COMPILER_ENV_VARS :=

ifneq (,$(OPENJ9_CC))
CUSTOM_COMPILER_ENV_VARS += CC="$(OPENJ9_CC)"
endif
ifneq (,$(OPENJ9_CXX))
CUSTOM_COMPILER_ENV_VARS += CXX="$(OPENJ9_CXX)"
endif
ifneq (,$(OPENJ9_DEVELOPER_DIR))
CUSTOM_COMPILER_ENV_VARS += DEVELOPER_DIR="$(OPENJ9_DEVELOPER_DIR)"
endif

run-preprocessors-j9 : stage-j9
Expand Down Expand Up @@ -417,11 +419,11 @@ run-preprocessors-j9 : stage-j9
build-j9 : run-preprocessors-j9
@$(ECHO) Compiling OpenJ9 in $(OUTPUT_ROOT)/vm
ifeq (true,$(OPENJ9_ENABLE_CMAKE))
(export OPENJ9_BUILD=true $(EXPORT_MSVS_ENV_VARS) $(SETUP_CUSTOM_COMPILER_ENV_VARS) \
(export OPENJ9_BUILD=true $(EXPORT_MSVS_ENV_VARS) $(CUSTOM_COMPILER_ENV_VARS) \
&& $(MAKE) -C $(OUTPUT_ROOT)/vm/build $(MAKEFLAGS) install \
)
else
(export OPENJ9_BUILD=true $(EXPORT_NO_USE_MINGW) $(EXPORT_MSVS_ENV_VARS) $(SETUP_CUSTOM_COMPILER_ENV_VARS) \
(export OPENJ9_BUILD=true $(EXPORT_NO_USE_MINGW) $(EXPORT_MSVS_ENV_VARS) $(CUSTOM_COMPILER_ENV_VARS) \
&& cd $(OUTPUT_ROOT)/vm \
&& $(MAKE) $(MAKEFLAGS) JAVA_VERSION=80 VERSION_MAJOR=8 all \
)
Expand Down
2 changes: 1 addition & 1 deletion common/autoconf/generated-configure.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4336,7 +4336,7 @@ VS_SDK_PLATFORM_NAME_2017=
#CUSTOM_AUTOCONF_INCLUDE

# Do not change or remove the following line, it is needed for consistency checks:
DATE_WHEN_GENERATED=1540901408
DATE_WHEN_GENERATED=1541112610

###############################################################################
#
Expand Down
Loading