Merge pull request #71 from blas-lapack-rs/vcpkgfix

x86-windows-static-md triplet for vcpkg

Author: termoshtt

.github/workflows/openblas-src.yml

@@ -12,9 +12,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        feature:
-          - system
-          - "system,static"
+        triple:
+          - x64-windows
+          - x64-windows-static
+          - x64-windows-static-md
     steps:
     - uses: actions/checkout@v1
     - uses: actions/cache@v2
@@ -26,22 +27,37 @@ jobs:
         git clone https://github.com/Microsoft/vcpkg.git --depth 1
         cd vcpkg
         ./bootstrap-vcpkg.bat
-    - name: Install static OpenBLAS by vcpkg
-      run: |
-        ./vcpkg/vcpkg.exe install openblas:x64-windows-static
-      if: ${{ matrix.feature == 'system,static' }}
     - name: Install OpenBLAS by vcpkg
       run: |
-        ./vcpkg/vcpkg.exe install openblas:x64-windows
-      if: ${{ matrix.feature == 'system' }}
+        ./vcpkg/vcpkg.exe install openblas:${{ matrix.triple }}
+
     - uses: actions-rs/cargo@v1
+      name: Test features=system
       with:
         command: test
-        args: >
-          --features=${{ matrix.feature }}
-          --manifest-path=openblas-src/Cargo.toml
+        args: --features=system --manifest-path=openblas-src/Cargo.toml
+      env:
+        VCPKG_ROOT: ${{ github.workspace }}/vcpkg
+      if: ${{ matrix.triple == 'x64-windows' }}
+
+    - uses: actions-rs/cargo@v1
+      name: Test features=system,static
+      with:
+        command: test
+        args: --features=system,static --manifest-path=openblas-src/Cargo.toml
+      env:
+        VCPKG_ROOT: ${{ github.workspace }}/vcpkg
+      if: ${{ matrix.triple == 'x64-windows-static-md' }}
+
+    - uses: actions-rs/cargo@v1
+      name: Test features=system,static with crt-static
+      with:
+        command: test
+        args: --features=system,static --manifest-path=openblas-src/Cargo.toml
       env:
         VCPKG_ROOT: ${{ github.workspace }}/vcpkg
+        RUSTFLAGS: "-C target-feature=+crt-static"
+      if: ${{ matrix.triple == 'x64-windows-static' }}
 
   macos:
     runs-on: macos-10.15

README.md

@@ -39,12 +39,26 @@ toolchain, install `openblas` for the `x64-windows` triplet:
 vcpkg install openblas --triplet x64-windows
 ```
 
-To link statically, install `openblas` for the `x64-windows-static` triplet:
+To link OpenBLAS statically, install `openblas` for the `x64-windows-static-md` triplet:
+
+```sh
+vcpkg install openblas --triplet x64-windows-static-md
+```
+
+To link OpenBLAS and C Runtime (CRT) statically, install `openblas` for the `x64-windows-static` triplet:
 
 ```sh
 vcpkg install openblas --triplet x64-windows-static
 ```
 
+and build with `+crt-static` option
+
+```
+RUSTFLAGS='-C target-feature=+crt-static' cargo build --target x86_64-pc-windows-msvc
+```
+
+Please see the ["Static and dynamic C runtimes" in The Rust reference](https://doc.rust-lang.org/reference/linkage.html#static-and-dynamic-c-runtimes) for detail.
+
 ## Cross Compilation
 
 Apart from providing the `--target` option to `cargo build`, one also has to

openblas-src/build.rs

@@ -31,9 +31,7 @@ fn windows_gnu_system() {
 
 /// Use vcpkg for msvc "system" feature
 fn windows_msvc_system() {
-    if feature_enabled("static") {
-        env::set_var("CARGO_CFG_TARGET_FEATURE", "crt-static");
-    } else {
+    if !feature_enabled("static") {
         env::set_var("VCPKGRS_DYNAMIC", "1");
     }
     #[cfg(target_env = "msvc")]