cleanup CI, fix unrecognized --strip

roc-lang · Sep 27, 2023 · fc8c103 · fc8c103
1 parent 5462600
commit fc8c103
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/.github/workflows/macos_x86_64.yml b/.github/workflows/macos_x86_64.yml
@@ -1,5 +1,5 @@
 on:
-  pull_request:
+  #pull_request:
 
 name: Macos x86-64 rust tests
 
@@ -22,10 +22,6 @@ jobs:
       - name: set LLVM_SYS_160_PREFIX
         run: echo "LLVM_SYS_160_PREFIX=$(brew --prefix llvm@16)" >> $GITHUB_ENV
 
-      - run: echo $LLVM_SYS_160_PREFIX
-
-      - run: ls $LLVM_SYS_160_PREFIX
-
       - name: Update PATH to use zig 11
         run: |
           echo "PATH=/Users/username1/Downloads/zig-macos-x86_64-0.11.0:$PATH" >> $GITHUB_ENV

diff --git a/.github/workflows/nix_linux_x86_64.yml b/.github/workflows/nix_linux_x86_64.yml
@@ -1,5 +1,5 @@
 on:
-  #pull_request:
+  pull_request:
 
 name: Nix linux x86_64 cargo test
 

diff --git a/crates/compiler/build/src/link.rs b/crates/compiler/build/src/link.rs
@@ -295,7 +295,7 @@ pub fn build_zig_host_wasm32(
             "wasm32-wasi",
             // "-femit-llvm-ir=/home/folkertdev/roc/roc/crates/cli_testing_examples/benchmarks/platform/host.ll",
             "-fPIC",
-            "--strip",
+            "-fstrip",
         ]);
 
     if matches!(opt_level, OptLevel::Optimize) {
@@ -1207,7 +1207,7 @@ fn link_wasm32(
             &format!("glue::{}", find_zig_glue_path().to_str().unwrap()),
             "--deps",
             "glue",
-            "--strip",
+            "-fstrip",
             "-O",
             "ReleaseSmall",
             // useful for debugging

diff --git a/crates/linker/src/pe.rs b/crates/linker/src/pe.rs
@@ -1669,7 +1669,7 @@ mod test {
                 "app.zig",
                 "-target",
                 "x86_64-windows-gnu",
-                "--strip",
+                "-fstrip",
                 "-rdynamic",
                 "-OReleaseFast",
             ])
@@ -1707,7 +1707,7 @@ mod test {
             "-target",
             "x86_64-windows-gnu",
             "-rdynamic",
-            "--strip",
+            "-fstrip",
             "-rdynamic",
             "-OReleaseFast",
         ]);
@@ -1929,7 +1929,7 @@ mod test {
             "-target",
             "x86_64-windows-gnu",
             "-rdynamic",
-            "--strip",
+            "-fstrip",
             "-OReleaseFast",
         ]);