Pass rustflags consistently

type: fixed
casey · Oct 12, 2021 · 5bfc5e8 · 5bfc5e8
1 parent b82ccf1
commit 5bfc5e8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -39,7 +39,7 @@ jobs:
     runs-on: ${{matrix.os}}
 
     env:
-      RUSTFLAGS: "-D warnings"
+      RUSTFLAGS: --deny warnings --codegen target-feature=+crt-static
 
     steps:
     - uses: actions/checkout@v2

diff --git a/bin/package b/bin/package
@@ -26,16 +26,12 @@ case $os in
     ;;
 esac
 
-case $os in
-  ubuntu-latest | macos-latest)
-    cargo rustc --bin $bin --target $target --release
-    executable=target/$target/release/$bin
-    ;;
-  windows-latest)
-    cargo rustc --bin $bin --target $target --release -- -C target-feature="+crt-static"
-    executable=target/$target/release/$bin.exe
-    ;;
-esac
+cargo build --bin $bin --target $target --release
+executable=target/$target/release/$bin
+
+if [[ $os == windows-2016 ]]; then
+  executable=$executable.exe
+fi
 
 echo "Building completions..."
 cargo run --package gen -- --bin $executable completion-scripts