Skip to content

Commit

Permalink
[GR-32150] Require at least macOS Sierra (10.12) for GraalVM.
Browse files Browse the repository at this point in the history
PullRequest: graal/9178
  • Loading branch information
eregon committed Jun 20, 2021
2 parents bffea6c + dc52498 commit 89fc926
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
4 changes: 2 additions & 2 deletions espresso/ci_common/common.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ local benchmark_suites = ['dacapo', 'renaissance', 'scala-dacapo'];

darwin: self.common + {
environment+: {
// for compatibility with macOS El Capitan
MACOSX_DEPLOYMENT_TARGET: '10.11',
// for compatibility with macOS Sierra
MACOSX_DEPLOYMENT_TARGET: '10.12',
},
capabilities: ['darwin', 'amd64'],
},
Expand Down
6 changes: 3 additions & 3 deletions sulong/mx.sulong/suite.py
Original file line number Diff line number Diff line change
Expand Up @@ -654,7 +654,7 @@
"SULONG_BOOTSTRAP_TOOLCHAIN_NO_HOME",
],
"cmakeConfig" : {
"CMAKE_OSX_DEPLOYMENT_TARGET" : "10.11",
"CMAKE_OSX_DEPLOYMENT_TARGET" : "10.12",
"CMAKE_C_COMPILER" : "<path:SULONG_BOOTSTRAP_TOOLCHAIN_NO_HOME>/bin/<cmd:clang>",
"CMAKE_CXX_COMPILER" : "<path:SULONG_BOOTSTRAP_TOOLCHAIN_NO_HOME>/bin/<cmd:clang++>",
"GRAALVM_LLVM_INCLUDE_DIR" : "<path:com.oracle.truffle.llvm.libraries.graalvm.llvm>/include",
Expand Down Expand Up @@ -705,7 +705,7 @@
"com.oracle.truffle.llvm.libraries.graalvm.llvm",
],
"cmakeConfig" : {
"CMAKE_OSX_DEPLOYMENT_TARGET" : "10.11",
"CMAKE_OSX_DEPLOYMENT_TARGET" : "10.12",
"CMAKE_C_COMPILER" : "<path:SULONG_BOOTSTRAP_TOOLCHAIN_NO_HOME>/bin/<cmd:clang>",
"GRAALVM_LLVM_INCLUDE_DIR" : "<path:com.oracle.truffle.llvm.libraries.graalvm.llvm>/include",
"LLVM_LINK" : "<path:LLVM_TOOLCHAIN>/bin/<exe:llvm-link>",
Expand All @@ -730,7 +730,7 @@
"sdk:LLVM_TOOLCHAIN",
],
"cmakeConfig" : {
"CMAKE_OSX_DEPLOYMENT_TARGET" : "10.11",
"CMAKE_OSX_DEPLOYMENT_TARGET" : "10.12",
"CMAKE_C_COMPILER" : "<path:LLVM_TOOLCHAIN>/bin/<exe:clang>",
"TRUFFLE_NFI_NATIVE_INCLUDE" : "<path:truffle:TRUFFLE_NFI_NATIVE>/include",
"CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS" : "YES",
Expand Down
3 changes: 2 additions & 1 deletion vm/ci_common/common.hocon
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ common_vm_darwin: ${common_vm} ${darwin} {
}
environment: {
LANG: en_US.UTF-8
MACOSX_DEPLOYMENT_TARGET: "10.11"
# for compatibility with macOS Sierra
MACOSX_DEPLOYMENT_TARGET: "10.12"
}
setup: ${common_vm.setup}
}
Expand Down
2 changes: 1 addition & 1 deletion vm/mx.vm/suite.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
},
{
"name": "truffleruby",
"version": "139963a0c2c49d2669275dd19d48a0c1ac45b660",
"version": "970501c92a3e18deff2597e10061e0184ec6236b",
"dynamic": True,
"urls": [
{"url": "https://github.com/oracle/truffleruby.git", "kind": "git"},
Expand Down

0 comments on commit 89fc926

Please sign in to comment.