diff --git a/.cargo/config.toml b/.cargo/config.toml index d7b556ec..f4633610 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -20,6 +20,12 @@ rustflags = [ "-Clink-arg=/DEFAULTLIB:libucrt", "-Clink-arg=/NODEFAULTLIB:msvcrt", "-Clink-arg=/NODEFAULTLIB:msvcprt" + "-Clink-arg=/NODEFAULTLIB:libcmt.dll", + "-Clink-arg=/NODEFAULTLIB:msvcrtd", + "-Clink-arg=/NODEFAULTLIB:msvcprtd", + "-Ctarget-feature=+crt-static", + "-Zpanic-abort-tests", + "-Clto=yes" ] [target.x86_64-pc-windows-msvc.env] @@ -28,6 +34,16 @@ ROCKSDB_LIB_DIR = "" LIBROCKSDB_STATIC = "1" ROCKSDB_STATIC_LIB = "1" VCPKG_ALL_STATIC = "1" +# Existing vars... +VCPKGRS_DYNAMIC = "0" +RUSTFLAGS = "-Ctarget-feature=+crt-static" +# For native-tls +OPENSSL_STATIC = "1" +OPENSSL_NO_VENDOR = "0" +# For any dependencies using cmake +CMAKE_STATIC_VCRT = "True" +# For any dependencies using pkg-config +PKG_CONFIG_ALL_STATIC = "1" [target.'cfg(all())'] rustflags = ["--cfg", "tokio_unstable"] diff --git a/Cargo.toml b/Cargo.toml index c74a55fb..c2406ef2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -83,7 +83,7 @@ mime2ext = "0.1.52" fastrace = { version = "0.7", features = [ "enable" ] } must-let = { git = "https://github.com/sujayakar/must-let", rev = "5b487d78db235e396e61dd03ce261ced0eafff9d" } mysql_async = { git = "https://github.com/get-convex/mysql_async", rev = "44138cf6422504dc60691957ba3026e3297ab77e" } -native-tls = "^0.2.10" +native-tls = { version = "^0.2.10" num_cpus = "1.16.0" oauth2 = "4.4.2" openidconnect = { git = "https://github.com/get-convex/openidconnect-rs", rev = "eb55e703f0c0585e3ed796f48e3ed9e96b56d31d", features = [ "accept-rfc3339-timestamps" ] }