Fix static linking on Windows (#199)

agora-org · Oct 11, 2021 · 516b5bb · 516b5bb
1 parent cb395c5
commit 516b5bb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -31,15 +31,18 @@ jobs:
         include:
         - target: x86_64-apple-darwin
           os: macos-latest
+          rustflags: --deny warnings
         - target: x86_64-pc-windows-msvc
           os: windows-latest
+          rustflags: --deny warnings --codegen=target-feature=+crt-static
         - target: x86_64-unknown-linux-gnu
           os: ubuntu-latest
+          rustflags: --deny warnings
 
     runs-on: ${{ matrix.os }}
 
     env:
-      RUSTFLAGS: "--deny warnings"
+      RUSTFLAGS: ${{ matrix.rustflags }}
 
     steps:
     - uses: actions/checkout@v2

diff --git a/bin/package b/bin/package
@@ -9,17 +9,12 @@ BIN=agora
 echo "Packaging $BIN $VERSION for $TARGET..."
 
 echo "Building $BIN..."
+cargo build --bin $BIN --target $TARGET --release
+EXECUTABLE=target/$TARGET/release/$BIN
 
-case $OS in
-  ubuntu-latest | macos-latest)
-    cargo build --bin $BIN --target $TARGET --release
-    EXECUTABLE=target/$TARGET/release/$BIN
-    ;;
-  windows-latest)
-    cargo rustc --bin $BIN --target $TARGET --release -- --codegen target-feature="+crt-static"
-    EXECUTABLE=target/$TARGET/release/$BIN.exe
-    ;;
-esac
+if [[ $OS == windows-latest ]]; then
+  EXECUTABLE=$EXECUTABLE.exe
+fi
 
 echo "Copying release files..."
 mkdir dist