Skip to content

[build] Have a single definition of C++ compiler #20

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

Merged
merged 1 commit into from
Jul 18, 2023
Merged

[build] Have a single definition of C++ compiler #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions deps/build.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ using UUIDs
##

const libpoplar_dir = joinpath(get_scratch!(UUID(TOML.parsefile(joinpath(dirname(@__DIR__), "Project.toml"))["uuid"]), "libpoplar"), "v$(Base.thispatch(VERSION))")
const cxx = get(ENV, "CXX", "g++")
const allowed_namespaces = ("poplar", "popops")

# TODO: I really shouldn't be using strings everywhere for these
Expand All @@ -34,7 +35,6 @@ DefaultBindgenContext() = DefaultBindgenContext([], [], Set([]), Set([]), "", ""


function get_system_includes()::Vector{String}
cxx = get(ENV, "CXX", "g++")
io = IOBuffer()
readchomp(pipeline(`$(cxx) -x c++ -E -Wp,-v - -fsyntax-only`; stdin=IOBuffer(""), stderr=io))
m = match(r"#include <\.\.\.> search starts here:(.*)End of search list\."s, String(take!(io)))[1]
Expand Down Expand Up @@ -640,7 +640,6 @@ function build_bindings(; path::String=joinpath(libpoplar_dir, "libpoplar_julia.

if compile
cxxwrap_include_dir = joinpath(libcxxwrap_julia_jll.artifact_dir, "include")
cxx = get(ENV, "CXX", "g++-10")
julia_include_dir = joinpath(dirname(Sys.BINDIR), "include", "julia")
mkpath(dirname(path))
run(```
Expand Down