Skip to content

Commit

Permalink
Configure cross some more
Browse files Browse the repository at this point in the history
Most of the building does not properly work anyways.
  • Loading branch information
kleinesfilmroellchen committed Apr 23, 2023
1 parent efc410e commit 879f7f6
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[target.x86_64-unknown-linux-gnu]
# linker = "clang"
linker = "clang"
# Uncomment this if you want to link with mold.
# rustflags = ["-C", "link-arg=-fuse-ld=/usr/bin/mold"]

Expand Down
4 changes: 4 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -117,3 +117,7 @@ inherits = "release"
lto = "thin"
opt-level = 3
incremental = true

# Cross configuration
[package.metadata.cross.target.x86_64-unknown-linux-gnu]
pre-build = ["apt-get update && apt-get install -y openssl clang"] # openssl seems to be outdated otherwise
3 changes: 1 addition & 2 deletions sals/vscode/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
"main": "./dist/extension.js",
"scripts": {
"vscode:prepublish": "yarn run esbuild-base -- --minify",
"server-compile-win": "cross install --locked --force --no-track --target x86_64-pc-windows-msvc --bin sals --profile=spcasm-release --root dist --path ..",
"server-compile-nowin": "cross install --locked --force --no-track --target x86_64-unknown-linux-gnu --bin sals --profile=spcasm-release --root dist --path .. && cross install --locked --force --no-track --target x86_64-apple-darwin --bin sals --profile=spcasm-release --root dist --path .. && cross install --locked --force --no-track --target aarch64-apple-darwin --bin sals --profile=spcasm-release --root dist --path ..",
"server-compile": "cargo install --locked --force --no-track --bin sals --profile=spcasm-release --root dist --path ..",
"esbuild-base": "esbuild ./src/extension.ts --bundle --outfile=./dist/extension.js --external:vscode --format=cjs --platform=node",
"esbuild": "yarn run esbuild-base -- --sourcemap && cargo -C .. build",
"esbuild-watch": "yarn run esbuild-base -- --sourcemap --watch"
Expand Down

0 comments on commit 879f7f6

Please sign in to comment.