Add OSX support

Fixes eclipse/openj9/36 Signed-off-by: Joe Dekoning <[email protected]>
ibmruntimes · Oct 10, 2017 · 3482abc · 3482abc
1 parent a4765a5
commit 3482abc
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/closed/OpenJ9.gmk b/closed/OpenJ9.gmk
@@ -51,10 +51,8 @@ OPENJ9_MISC_FILES := \
 OPENJ9_NOTICE_FILES := openj9-notices.html
 OPENJ9_REDIRECTOR := redirector/$(LIBRARY_PREFIX)jvm_b156$(SHARED_LIBRARY_SUFFIX)
 
-# we should try using the makeflags as defined by openjdk (issue 59)
-NUMCPU := $(shell grep -c ^processor /proc/cpuinfo)
-#$(info NUMCPU = $(NUMCPU))
-override MAKEFLAGS := -j $(NUMCPU)
+# openjdk makeflags don't work with openj9/omr native compiles; override with number of cpus which openj9 and omr need supplied
+override MAKEFLAGS := -j $(JOBS)
 
 # honour the --disable-warnings-as-errors configure parameter during compilation of OMR
 ifeq (false,$(WARNINGS_AS_ERRORS))
@@ -213,7 +211,7 @@ OPENJ9_VERSION_VARS := \
 	#
 
 OPENJ9_VERSION_SCRIPT := \
-	$(foreach var,$(OPENJ9_VERSION_VARS),-e 's:@${var}@:$(value $(var)):g')
+	$(foreach var,$(OPENJ9_VERSION_VARS),-e 's|@${var}@|$(value $(var))|g')
 
 $(OUTPUT_ROOT)/vm/util/openj9_version_info.h : $(SRC_ROOT)/closed/openj9_version_info.h.in
 	@$(MKDIR) -p $(@D)

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=oa64
+      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=1507318859
 
 ###############################################################################
 #
@@ -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=oa64
+      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=1507318859
 
 ###############################################################################
 #