From 025e11da620166aeca2667bd5264ada1b33d11e5 Mon Sep 17 00:00:00 2001 From: Dang Mai Date: Sun, 2 Feb 2025 11:45:59 -0800 Subject: [PATCH 1/3] generate compat x64 binary --- packages/apex-ast-serializer/parser/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/apex-ast-serializer/parser/build.gradle b/packages/apex-ast-serializer/parser/build.gradle index 76a343e7..81d0f3db 100644 --- a/packages/apex-ast-serializer/parser/build.gradle +++ b/packages/apex-ast-serializer/parser/build.gradle @@ -155,6 +155,7 @@ graalvmNative { environmentVariables.put("PATH", file('../musl-toolchain/bin').absolutePath + ":" + System.getenv("PATH")) buildArgs.add('--static'); buildArgs.add('--libc=musl'); + buildArgs.add('-march=compatibility'); // #1733, #1809 - We need to manually increase stack size for musl static binary, // otherwise we will run into stack overflow issues. // https://github.com/oracle/graal/issues/3398 From d94c8259a983bf1bc7b856a99bae3ec8ea2fa314 Mon Sep 17 00:00:00 2001 From: Dang Mai Date: Sun, 2 Feb 2025 13:30:39 -0800 Subject: [PATCH 2/3] Add comment --- packages/apex-ast-serializer/parser/build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/apex-ast-serializer/parser/build.gradle b/packages/apex-ast-serializer/parser/build.gradle index 81d0f3db..358c25c5 100644 --- a/packages/apex-ast-serializer/parser/build.gradle +++ b/packages/apex-ast-serializer/parser/build.gradle @@ -155,6 +155,9 @@ graalvmNative { environmentVariables.put("PATH", file('../musl-toolchain/bin').absolutePath + ":" + System.getenv("PATH")) buildArgs.add('--static'); buildArgs.add('--libc=musl'); + // #1822 - By default, the native executable can't be run in Docker x64 + // images on macOS with M-chips. We set the compatibility flag to ensure + // it can be run in that context, although it may not be as optimized. buildArgs.add('-march=compatibility'); // #1733, #1809 - We need to manually increase stack size for musl static binary, // otherwise we will run into stack overflow issues. From 44a3ba1bf43c4470c4e235ed7d15cf721f5d2acf Mon Sep 17 00:00:00 2001 From: Dang Mai Date: Sun, 2 Feb 2025 13:32:02 -0800 Subject: [PATCH 3/3] Add CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e1f653a3..0b4b5ccc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Unreleased - Fix Linux native executables having low stack depth ([issue](https://github.com/dangmai/prettier-plugin-apex/issues/1809), [issue](https://github.com/dangmai/prettier-plugin-apex/issues/1733)). +- Fix Linux native executables not being able to run in macOS Docker on Apple Silicon ([issue](https://github.com/dangmai/prettier-plugin-apex/issues/1822)). - Fix duplicate newlines after last trailing comment in document ([issue](https://github.com/dangmai/prettier-plugin-apex/issues/1777)). # 2.2.2