Skip to content
This repository has been archived by the owner on Oct 22, 2020. It is now read-only.

Copy configured values to relevant UMA properties in .spec files #42

Merged
merged 1 commit into from
Jun 15, 2018
Merged

Copy configured values to relevant UMA properties in .spec files #42

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 12 additions & 2 deletions closed/OpenJ9.gmk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,18 @@ else
FEATURE_SED_SCRIPT := $(call SedDisable,opt_cuda)
endif

# Adjust .spec files replacing references to gcc-4.6. Openjdk requires 4.8.2 or newer.
SPEC_SED_SCRIPT := -e 's/gcc-4.6/gcc/g'
# Function to generate sed program fragment.
# $1 - name of make macro to use instead of a hard-coded tool reference.
# $2 - suffix of uma_make_cmd property name to be adjusted.
SedUmaCommand = -e '/<property name="uma_make_cmd_$(strip $2)"/s|value="[^"]*"|value="$($(strip $1))"|'

# Copy configured values to relevant UMA properties in .spec files.
SPEC_SED_SCRIPT := \
$(call SedUmaCommand, CC, cc) \
$(call SedUmaCommand, CXX, cxx) \
$(call SedUmaCommand, CXX, interp_gcc) \
$(call SedUmaCommand, CXX, ppc_gcc_cxx) \
#

# Adjust DDR enablement flags.
ifeq (true,$(OPENJ9_ENABLE_DDR))
Expand Down