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

Minor changes #365

Merged
merged 3 commits into from
Sep 29, 2023
Merged

Minor changes #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
93d44c5
Don't include Legacy PM pass functionality when not useful.
maleadt Sep 29, 2023
f92649b
Remove old workaround for Pkg preferences bug.
maleadt Sep 29, 2023
8e14575
Force generation of MSYS Makefiles to prevent picking up MSVC.
maleadt Sep 29, 2023
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
11 changes: 6 additions & 5 deletions deps/build_local.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,12 @@ LLVM_DIR = joinpath(LLVM.artifact_dir, "lib", "cmake", "llvm")
# build and install
@info "Building" source_dir scratch_dir build_dir LLVM_DIR
cmake() do cmake_path
run(`$cmake_path -DLLVM_DIR=$(LLVM_DIR) -DCMAKE_INSTALL_PREFIX=$(scratch_dir) -B$(build_dir) -S$(source_dir)`)
config_opts = `-DLLVM_DIR=$(LLVM_DIR) -DCMAKE_INSTALL_PREFIX=$(scratch_dir)`
if Sys.iswindows()
# prevent picking up MSVC
config_opts = `$config_opts -G "MSYS Makefiles"`
end
run(`$cmake_path $config_opts -B$(build_dir) -S$(source_dir)`)
run(`$cmake_path --build $(build_dir) --target install`)
end

Expand All @@ -66,7 +71,3 @@ set_preferences!(
"libLLVMExtra_path" => lib_path;
force=true,
)

# copy the preferences to `test/` as well to work around Pkg.jl#2500
cp(joinpath(dirname(@__DIR__), "LocalPreferences.toml"),
joinpath(dirname(@__DIR__), "test", "LocalPreferences.toml"); force=true)
5 changes: 4 additions & 1 deletion src/interop.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,14 @@ import ..LLVM: API

include("interop/base.jl")
include("interop/asmcall.jl")
include("interop/passes.jl")
include("interop/pointer.jl")
include("interop/utils.jl")
include("interop/intrinsics.jl")

if VERSION < v"1.11.0-DEV.428"
include("interop/passes.jl")
end

if LLVM.has_newpm() && VERSION >= v"1.10.0-DEV.1622"
include("interop/newpm.jl")
end
Expand Down
Loading