Skip to content

Commit

Permalink
FMT
Browse files Browse the repository at this point in the history
  • Loading branch information
soerenbf committed Sep 18, 2024
1 parent a54db33 commit e6a124b
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions Setup.hs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ linuxBuild True env verbosity = do
rawSystemExitWithEnv
verbosity
"cargo"
(["rustc", "--release", "--manifest-path", "rust-src/" ++ libName ++"/Cargo.toml", "--target", "x86_64-unknown-linux-musl", "--crate-type", "staticlib"] ++ libFeatures)
(["rustc", "--release", "--manifest-path", "rust-src/" ++ libName ++ "/Cargo.toml", "--target", "x86_64-unknown-linux-musl", "--crate-type", "staticlib"] ++ libFeatures)
(("RUSTFLAGS", "-C target-feature=-crt-static") : env)
let source = "../rust-src/target/x86_64-unknown-linux-musl/release/lib" ++ libName ++ ".a"
target = "./lib/lib" ++ libName ++ ".a"
Expand All @@ -44,7 +44,7 @@ linuxBuild False env verbosity = do
let makeLib lib = do
let libName = fst lib
libFeatures = snd lib
rawSystemExitWithEnv verbosity "cargo" (["rustc", "--release", "--manifest-path", "rust-src/" ++ libName ++"/Cargo.toml", "--crate-type", "cdylib"] ++ libFeatures) env
rawSystemExitWithEnv verbosity "cargo" (["rustc", "--release", "--manifest-path", "rust-src/" ++ libName ++ "/Cargo.toml", "--crate-type", "cdylib"] ++ libFeatures) env
notice verbosity "Linking libraries to ./lib"
let source = "../rust-src/target/release/lib" ++ libName
target = "./lib/lib" ++ libName
Expand All @@ -58,7 +58,7 @@ windowsBuild env verbosity = do
let makeLib lib = do
let libName = fst lib
libFeatures = snd lib
rawSystemExitWithEnv verbosity "cargo" (["rustc", "--release", "--manifest-path", "rust-src/" ++ libName ++"/Cargo.toml", "--crate-type", "cdylib"] ++ libFeatures) env
rawSystemExitWithEnv verbosity "cargo" (["rustc", "--release", "--manifest-path", "rust-src/" ++ libName ++ "/Cargo.toml", "--crate-type", "cdylib"] ++ libFeatures) env
notice verbosity "Copying libraries to ./lib"
-- We delete the static library if present to ensure that we only link with the
-- dynamic library.
Expand All @@ -77,7 +77,7 @@ osxBuild static env verbosity = do
libFeatures = snd lib
if static
then do
rawSystemExitWithEnv verbosity "cargo" (["rustc", "--release", "--manifest-path", "rust-src/" ++ libName ++"/Cargo.toml", "--crate-type", "staticlib"] ++ libFeatures) env
rawSystemExitWithEnv verbosity "cargo" (["rustc", "--release", "--manifest-path", "rust-src/" ++ libName ++ "/Cargo.toml", "--crate-type", "staticlib"] ++ libFeatures) env
notice verbosity "Linking libraries to ./lib"
let source = "../rust-src/target/release/lib" ++ libName ++ ".a"
let target = "./lib/lib" ++ libName ++ ".a"
Expand All @@ -87,7 +87,7 @@ osxBuild static env verbosity = do
noticeNoWrap verbosity $ "Linked: " ++ target ++ " -> " ++ source
noticeNoWrap verbosity $ "Removed: " ++ others
else do
rawSystemExitWithEnv verbosity "cargo" (["rustc", "--release", "--manifest-path", "rust-src/" ++ libName ++"/Cargo.toml", "--crate-type", "cdylib"] ++ libFeatures) env
rawSystemExitWithEnv verbosity "cargo" (["rustc", "--release", "--manifest-path", "rust-src/" ++ libName ++ "/Cargo.toml", "--crate-type", "cdylib"] ++ libFeatures) env
notice verbosity "Linking libraries to ./lib"
let source = "../rust-src/target/release/lib" ++ libName ++ ".dylib"
let others = "./lib/lib" ++ libName ++ ".a"
Expand Down

0 comments on commit e6a124b

Please sign in to comment.