Merge pull request #66 from jkawamoto/cstd

Improve the build script

.cargo/config.toml

@@ -1,5 +1,2 @@
-[env]
-CXXFLAGS = "-std=c++17"
-
 [target.'cfg(target_os = "windows")']
 rustflags = ["-C", "target-feature=+crt-static"]

.github/workflows/build.yaml

@@ -12,7 +12,9 @@ jobs:
   check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-python@v3
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
       - uses: actions/checkout@v4
       - uses: dprint/check@v2.2
       - uses: pre-commit/action@v3.0.1

build.rs

@@ -37,7 +37,6 @@ fn main() {
 
     let mut cmake = Config::new("CTranslate2");
     cmake
-        .static_crt(true)
         .define("BUILD_CLI", "OFF")
         .define("BUILD_SHARED_LIBS", "OFF")
         .define("WITH_MKL", "OFF")
@@ -49,7 +48,7 @@ fn main() {
         }
 
         println!("cargo::rustc-link-arg=/FORCE:MULTIPLE");
-        cmake.profile("Release");
+        cmake.profile("Release").cxxflag("/EHsc").static_crt(true);
     }
 
     if cfg!(feature = "cuda") {
@@ -90,7 +89,8 @@ fn main() {
     .file("src/generator.cpp")
     .include("CTranslate2/include")
     .std("c++17")
-    .static_crt(true)
+    .static_crt(cfg!(target_os = "windows"))
+    .flag_if_supported("/EHsc")
     .compile("ct2rs");
 }