From 4904e1e04b5306fec8164131e546fac230260822 Mon Sep 17 00:00:00 2001 From: Dr Owain Kenway Date: Mon, 17 Jul 2023 15:33:24 +0100 Subject: [PATCH 1/2] Change default C++ compiler from g++-10 to g++ --- deps/build.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/build.jl b/deps/build.jl index 8111a1e..1c7e310 100644 --- a/deps/build.jl +++ b/deps/build.jl @@ -34,7 +34,7 @@ DefaultBindgenContext() = DefaultBindgenContext([], [], Set([]), Set([]), "", "" function get_system_includes()::Vector{String} - cxx = get(ENV, "CXX", "g++-10") + 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] From 404f578485525edb0b1b6b0dc5985653f9a223ba Mon Sep 17 00:00:00 2001 From: Dr Owain Kenway Date: Tue, 18 Jul 2023 10:57:52 +0100 Subject: [PATCH 2/2] Remove remaining instance of g++-10 --- deps/build.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/build.jl b/deps/build.jl index 1c7e310..0caeda9 100644 --- a/deps/build.jl +++ b/deps/build.jl @@ -640,7 +640,7 @@ 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") + cxx = get(ENV, "CXX", "g++") julia_include_dir = joinpath(dirname(Sys.BINDIR), "include", "julia") mkpath(dirname(path)) run(```