Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

try out windows build fix #32

Open
wants to merge 14 commits into
base: main
Choose a base branch
from
Open

try out windows build fix #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8744559
try out windows build fix
thomasballinger Jan 28, 2025
763a4fa
try removing rush build
thomasballinger Jan 29, 2025
437999d
more linker flags
thomasballinger Jan 29, 2025
4f83760
another
thomasballinger Jan 29, 2025
137c8fd
more
thomasballinger Jan 29, 2025
f6b41ea
oops
thomasballinger Jan 29, 2025
8637c12
try
thomasballinger Jan 30, 2025
4fb721a
COmbined
thomasballinger Jan 30, 2025
87bcca8
who knows
thomasballinger Jan 30, 2025
e52353b
who knowns
thomasballinger Jan 31, 2025
086ce04
lto no
thomasballinger Jan 31, 2025
d8158db
moar
thomasballinger Jan 31, 2025
c590d3b
oops
thomasballinger Jan 31, 2025
7c75277
linker logs
thomasballinger Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 32 additions & 1 deletion .cargo/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,38 @@ rustflags = ["-Ctarget-cpu=apple-m1"]
[target.x86_64-pc-windows-msvc]
# FORCE:MULTIPLE is a bit sketchy. v8 and rocksdb both export the same symbol.
# This seems to work around it to build on windows, but it's not ideal.
rustflags = ["-Clink-arg=/FORCE:MULTIPLE", "-Clink-arg=/STACK:4194304"]
rustflags = [
"-Clink-arg=/FORCE:MULTIPLE",
"-Clink-arg=/STACK:4194304",
"-Ctarget-feature=+crt-static",
"-Clink-arg=/DEFAULTLIB:libcmt",
"-Clink-arg=/DEFAULTLIB:libvcruntime",
"-Clink-arg=/DEFAULTLIB:libucrt",
"-Clink-arg=/NODEFAULTLIB:msvcrt", # dynamic C runtime
"-Clink-arg=/NODEFAULTLIB:msvcprt", # dynamic C++ runtime
"-Clink-arg=/NODEFAULTLIB:msvcrtd", # dynamic debug C runtime
"-Clink-arg=/NODEFAULTLIB:msvcprtd", # dynamic debug C++ runtime
"-Zpanic-abort-tests"
]

[target.x86_64-pc-windows-msvc.env]
ROCKSDB_STATIC_LIB = "1"
VCPKG_ALL_STATIC = "1"
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"
LIBROCKSDB_STATIC = "1"
ROCKSDB_LIB_DIR = ""
SODIUM_STATIC = "1"
SODIUM_LIB_DIR = ""
RUSTY_V8_MIRROR = "https://github.com/denoland/rusty_v8/releases/download"
V8_STATIC = "1"

[target.'cfg(all())']
rustflags = ["--cfg", "tokio_unstable"]
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/precompile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ jobs:
- name: Install JS
run: |
just rush install
just rush build

- name: Precompute release name
id: release_name
Expand All @@ -79,7 +78,7 @@ jobs:
unset ROCKSDB_LIB_DIR
unset SODIUM_USE_PKG_CONFIG
unset SNAPPY_LIB_DIR
cargo build --release -p local_backend --bin convex-local-backend
RUSTFLAGS="-Clink-arg=/VERBOSE" cargo build -vv --release -p local_backend --bin convex-local-backend
mv target/release/${{ steps.release_name.outputs.BINARY_NAME }} .

- name: Zip backend into arch
Expand Down
Loading