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

Add OSX support #59

Merged
merged 1 commit into from
Oct 16, 2017
+8 −2
Merged

Add OSX support #59

Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions closed/autoconf/custom-hook.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,9 @@ AC_DEFUN_ONCE([OPENJ9_PLATFORM_SETUP],
elif test "x$OPENJDK_BUILD_OS" = xwindows; then
OPENJ9_PLATFORM_CODE=wa64
OPENJ9_BUILDSPEC="win_x86-64_cmprssptrs"
elif test "x$OPENJDK_BUILD_OS" = xmacosx; then
OPENJ9_PLATFORM_CODE=oa64
Copy link
Member

Choose a reason for hiding this comment

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

Is there a related pull-request that makes oa64 meaningful?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Its used with OpenJ9.gmk '-tag:define "PLATFORM-$(OPENJ9_PLATFORM_CODE)' as an option to jpp.

Copy link
Member

Choose a reason for hiding this comment

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

Yes, I knew that. Is eclipse-openj9/openj9#262 how 'oa64' becomes meaningful?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

My misunderstanding, yes combined with eclipse-openj9/openj9#262, and further future changes this platform will generate a valid set of binaries. The changes are incremental and not meant to be a final solution.

Copy link
Member

Choose a reason for hiding this comment

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

I guess the important point, though, is that this won't work without eclipse-openj9/openj9#262.

OPENJ9_BUILDSPEC="osx_x86-64"
else
AC_MSG_ERROR([Unsupported OpenJ9 platform ${OPENJDK_BUILD_OS}, contact support team!])
fi
Expand Down
5 changes: 4 additions & 1 deletion closed/autoconf/generated-configure.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5245,7 +5245,7 @@ VS_SDK_PLATFORM_NAME_2013=


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

###############################################################################
#
Expand Down Expand Up @@ -17136,6 +17136,9 @@ $as_echo "$as_me: Unknown variant(s) specified: $INVALID_VARIANTS" >&6;}
elif test "x$OPENJDK_BUILD_OS" = xwindows; then
OPENJ9_PLATFORM_CODE=wa64
OPENJ9_BUILDSPEC="win_x86-64_cmprssptrs"
elif test "x$OPENJDK_BUILD_OS" = xmacosx; then
OPENJ9_PLATFORM_CODE=oa64
OPENJ9_BUILDSPEC="osx_x86-64"
else
as_fn_error $? "Unsupported OpenJ9 platform ${OPENJDK_BUILD_OS}, contact support team!" "$LINENO" 5
fi
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 @@ -5186,7 +5186,7 @@ VS_SDK_PLATFORM_NAME_2013=
#CUSTOM_AUTOCONF_INCLUDE

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

###############################################################################
#
Expand Down