Revert "[GR-51231] Backport to 21.3: Build GraalVM on Big sur."

This reverts commit c48bb3d, reversing changes made to 5cc4b5c.
oracle · Apr 8, 2024 · 063ebda · 063ebda
1 parent c48bb3d
commit 063ebda
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/common.hocon b/common.hocon
@@ -59,7 +59,7 @@ linux-amd64 : ${linux} {
 }
 
 darwin-amd64 : ${darwin} {
-  capabilities : [darwin, amd64, "!darwin_sierra", "!darwin_mojave", "!darwin_catalina"]
+  capabilities : [darwin, amd64]
 }
 
 windows-amd64 : ${windows} {

diff --git a/common.jsonnet b/common.jsonnet
@@ -117,8 +117,7 @@
 
   darwin:: deps.darwin + self.common + {
     os::"darwin",
-    # Run darwin jobs on Big Sur or later by excluding all older versions
-    capabilities+: [self.os, "!darwin_sierra", "!darwin_mojave", "!darwin_catalina"],
+    capabilities+: [self.os],
   },
 
   windows:: deps.windows + self.common + {

diff --git a/graal-common.json b/graal-common.json
@@ -1,7 +1,7 @@
 {
   "README": "This file contains definitions that are useful for the hocon and jsonnet CI files of the graal and graal-enterprise repositories.",
   "ci": {
-    "overlay": "6ea7796de526686cea4f2c22f92a3f89d5c3828d"
+    "overlay": "010ceb18a29c973519013d5ee2b7498b567b6443"
   },
   "mx_version" : "5.310.0"
 }
diff --git a/sulong/tests/toolchain-launchers-tests/Makefile b/sulong/tests/toolchain-launchers-tests/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019, 2024, Oracle and/or its affiliates.
+# Copyright (c) 2019, 2021, Oracle and/or its affiliates.
 #
 # All rights reserved.
 #
@@ -91,7 +91,7 @@ endef
 CHECK_WRAPPER_SCRIPT= | grep "GraalVM wrapper script" $(QUIETLY_REDIR)
 
 ifeq ($(OS), darwin)
-SHARED_FLAGS=-dylib -arch x86_64 -macosx_version_min 10.14.0 -undefined dynamic_lookup
+SHARED_FLAGS=-dynamic -dylib -arch x86_64 -macosx_version_min 10.14.0 -lSystem
 else
 SHARED_FLAGS=--shared
 main.out: LDFLAGS+=-Wl,--gc-sections

diff --git a/vm/ci_common/common.hocon b/vm/ci_common/common.hocon
@@ -19,8 +19,8 @@ common_vm_darwin: ${common_vm} ${darwin} {
   }
   environment: {
     LANG: en_US.UTF-8
-    # for compatibility with macOS Big Sur
-    MACOSX_DEPLOYMENT_TARGET: "11.0"
+    # for compatibility with macOS Sierra
+    MACOSX_DEPLOYMENT_TARGET: "10.12"
   }
   setup: ${common_vm.setup}
 }
@@ -177,7 +177,7 @@ vm_linux_aarch64: ${common_vm_linux} {
 }
 
 vm_darwin: ${common_vm_darwin} {
-  capabilities: [darwin_bigsur, amd64, ram16gb]
+  capabilities: [darwin_mojave, amd64, ram16gb]
 }
 
 vm_windows: ${common_vm_windows} {