Add OSX support

Fixes eclipse/openj9/36 Signed-off-by: Joe Dekoning <[email protected]>
ibmruntimes · Oct 6, 2017 · 809efe5 · 809efe5
1 parent 42b55a0
commit 809efe5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/closed/OpenJ9.gmk b/closed/OpenJ9.gmk
@@ -202,7 +202,7 @@ stage-j9 : \
 	$(call openj9_copy_tree,$(OUTPUT_ROOT)/vm/omr,$(OPENJ9OMR_TOPDIR))
 
 OPENJ9_VERSION_VARS := \
-	COMPILER_VERSION_STRING \
+	#COMPILER_VERSION_STRING \
 	HOTSPOT_TARGET_OS \
 	OPENJDK_TARGET_CPU_BITS \
 	OPENJDK_TARGET_CPU_OSARCH \

diff --git a/closed/autoconf/custom-hook.m4 b/closed/autoconf/custom-hook.m4
@@ -138,6 +138,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=xa64
+      OPENJ9_BUILDSPEC="osx_x86-64"
     else
       AC_MSG_ERROR([Unsupported OpenJ9 platform ${OPENJDK_BUILD_OS}, contact support team!])
     fi

diff --git a/closed/autoconf/generated-configure.sh b/closed/autoconf/generated-configure.sh
@@ -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=1506706543
+DATE_WHEN_GENERATED=1507299140
 
 ###############################################################################
 #
@@ -17133,6 +17133,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=xa64
+      OPENJ9_BUILDSPEC="osx_x86-64"
     else
       as_fn_error $? "Unsupported OpenJ9 platform ${OPENJDK_BUILD_OS}, contact support team!" "$LINENO" 5
     fi

diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
@@ -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=1506706543
+DATE_WHEN_GENERATED=1507299140
 
 ###############################################################################
 #