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

Add OSX settings for PR builds #3215

Merged
merged 2 commits into from
Oct 18, 2018
Merged

Add OSX settings for PR builds #3215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20abc63
Add OSX settings for PR builds
jdekonin Oct 10, 2018
647fd77
Add OSX compiler variant
jdekonin Oct 17, 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
19 changes: 19 additions & 0 deletions buildenv/jenkins/variables/defaults.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,3 +354,22 @@ win_x86:
8: 'hw.arch.x86 && sw.os.windows'
test:
8: 'hw.arch.x86 && sw.os.windows'
#========================================#
# OSX x86 64bits Compressed Pointers
#========================================#
osx_x86-64_cmprssptrs:
boot_jdk:
8: '/Users/jenkins/bootjdks/openjdk-java-7'
11: '/Users/jenkins/bootjdks/adoptojdk-java-10'
release:
8: 'osx-x86_64-normal-server-release'
11: 'macosx-x86_64-normal-server-release'
freemarker: '/Users/jenkins/freemarker.jar'
openjdk_reference_repo: '/Users/jenkins/openjdk_cache'
node_labels:
build:
8: 'hw.arch.x86 && sw.os.osx'
11: 'hw.arch.x86 && sw.os.osx'
test:
8: 'hw.arch.x86 && sw.os.osx'
11: 'hw.arch.x86 && sw.os.osx'
7 changes: 7 additions & 0 deletions runtime/compiler/makefile.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,13 @@ export BUILD_CONFIG?=prod
<#elseif uma.spec.id?starts_with("linux_arm_linaro")>
export PLATFORM=arm-linux-gcc-cross
</#if>
<#if uma.spec.id?starts_with("osx_x86-64")>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe try something like

<#if uma.buildinfo.version.major == 8>
   export PLATFORM=amd64-osx-gcc
<#else>
   export PLATFORM=amd64-osx-clang
</#if>

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rebased and updated to handle v8 difference.

ifeq ($(VERSION_MAJOR),8)
export PLATFORM=amd64-osx-gcc
else
export PLATFORM=amd64-osx-clang
endif
</#if>

<#if uma.spec.flags.uma_codeCoverage.enabled>
export FE_CFLAGS+=-fprofile-arcs -ftest-coverage
Expand Down