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

Jump to bottom

build: don't force a specific compiler/version #60

Merged
merged 2 commits into from
Feb 2, 2024
Merged

build: don't force a specific compiler/version #60

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4bf2a7
fix(build): fixes include paths
ju1ius Jan 31, 2024
1733cfb
build: don't force a specific compiler/version
ju1ius Jan 31, 2024
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
6 changes: 1 addition & 5 deletions build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,14 +114,12 @@ fn main() {
let mut build = cc::Build::new();
build
.file("./deps/ada.cpp")
.include("./deps/ada.h")
.include("./deps/ada_c.h")
.include("./deps")
anonrig marked this conversation as resolved.
Show resolved Hide resolved
.cpp(true)
.std("c++17");

let compile_target_arch = env::var("CARGO_CFG_TARGET_ARCH").expect("CARGO_CFG_TARGET_ARCH");
let compile_target_os = env::var("CARGO_CFG_TARGET_OS").expect("CARGO_CFG_TARGET_OS");
let compile_target_env = env::var("CARGO_CFG_TARGET_ENV").expect("CARGO_CFG_TARGET_ENV");
let compile_target_feature = env::var("CARGO_CFG_TARGET_FEATURE");
// Except for Emscripten target (which emulates POSIX environment), compile to Wasm via WASI SDK
// which is currently the only standalone provider of stdlib for compilation of C/C++ libraries.
Expand Down Expand Up @@ -175,8 +173,6 @@ fn main() {
println!("cargo:rustc-link-lib=c");
build.file("./deps/wasi_to_unknown.cpp");
}
} else if !(compile_target_os == "windows" && compile_target_env == "msvc") {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it possible to add a GitHub workflow to ensure your case never gets broken?

Copy link
Contributor Author

@ju1ius ju1ius Jan 31, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You mean adding an ubuntu+gcc variant to the matrix?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You mean adding an ubuntu+gcc variant to the matrix?

I could do that (i.e. by passing CXX=g++ in the env), but I don't see an easy way to test that the build actually ends up using gcc...

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@steveklabnik wdyt?

build.compiler("clang++");
}

let compiler = build.get_compiler();
Expand Down
Loading