Fix stripping on macos. (#2394)

toitlang · Jun 11, 2024 · 5b1448c · 5b1448c
1 parent e9b4081
commit 5b1448c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,6 +10,12 @@ on:
   release:
     types: [published]
   workflow_dispatch:
+    inputs:
+      strip:
+        description: "Strip executables"
+        required: false
+        type: boolean
+        default: false
 
 env:
   ESPTOOL_VERSION: v4.6
@@ -203,8 +209,8 @@ jobs:
           echo "$TOITLSP" toitdoc -p $CPU_CORES --toitc=$TOITC "--sdk=$SDKDIR" "--out=$JSON_OUT_PATH" --version=$TOIT_VERSION lib
           "$TOITLSP" toitdoc -p $CPU_CORES --toitc=$TOITC "--sdk=$SDKDIR" "--out=$JSON_OUT_PATH" --version=$TOIT_VERSION lib
 
-      - name: Strip executables
-        if: github.event_name == 'release'
+      - name: Strip executables - Linux/Windows
+        if: runner.os != 'macOS' && (github.event_name == 'release' || inputs.strip == 'true')
         run: |
           strip -s build/host/sdk/bin/*
           strip -s build/host/sdk/tools/*

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -327,7 +327,6 @@ if (NOT "${TOIT_SYSTEM_NAME}" MATCHES "esp32")
       ${BOOT_SNAPSHOT_CC}
       ${run_SRC}
     )
-
     target_link_libraries(
       ${VESSEL_TARGET} ${TOIT_LINK_LIBS}
     )
@@ -336,6 +335,10 @@ if (NOT "${TOIT_SYSTEM_NAME}" MATCHES "esp32")
       PROPERTIES
       RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/sdk/vessels"
     )
+    set_target_properties(${VESSEL_TARGET}
+      PROPERTIES
+      LINK_FLAGS_RELEASE "-s"
+    )
 
     # Unsign the vessel executables.
     if ("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin")