Skip to content

Commit 0e0f872

Browse files
committed
Fixup macos issues
1 parent 8c46be1 commit 0e0f872

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/StaticCompiler.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ using LLD_jll: lld
1212
using StaticTools
1313
using StaticTools: @symbolcall, @c_str, println
1414
using Core: MethodTable
15-
using Base:BinaryPlatforms.Platform, BinaryPlatforms.HostPlatform, BinaryPlatforms.arch, BinaryPlatforms.os, BinaryPlatforms.libc_str
15+
using Base:BinaryPlatforms.Platform, BinaryPlatforms.HostPlatform, BinaryPlatforms.arch, BinaryPlatforms.os_str, BinaryPlatforms.libc_str
1616

1717
export load_function, compile_shlib, compile_executable
1818
export static_code_llvm, static_code_typed, static_llvm_module, static_code_native
@@ -399,7 +399,7 @@ function static_code_native(@nospecialize(f), @nospecialize(tt), fname=fix_name(
399399
end
400400

401401
# Return an LLVM module
402-
function static_llvm_module(f, tt, name=fix_name(f); demangle, target::StaticTarget=StaticTarget(), kwargs...)
402+
function static_llvm_module(f, tt, name=fix_name(f); demangle=true, target::StaticTarget=StaticTarget(), kwargs...)
403403
if !demangle
404404
name = "julia_"*name
405405
end

src/target.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ struct StaticTarget
2424
tm::LLVM.TargetMachine
2525
end
2626

27-
clean_triple(platform::Platform) = arch(platform) * "-" * os(platform) * libc_str(platform)
27+
clean_triple(platform::Platform) = arch(platform) * os_str(platform) * libc_str(platform)
2828
StaticTarget() = StaticTarget(HostPlatform(), unsafe_string(LLVM.API.LLVMGetHostCPUName()), unsafe_string(LLVM.API.LLVMGetHostCPUFeatures()))
2929
StaticTarget(platform::Platform) = StaticTarget(platform, LLVM.TargetMachine(LLVM.Target(triple = clean_triple(platform)), clean_triple(platform)))
3030
StaticTarget(platform::Platform, cpu::String) = StaticTarget(platform, LLVM.TargetMachine(LLVM.Target(triple = clean_triple(platform)), clean_triple(platform), cpu))

test/scripts/interop.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ function interop(argc, argv)
1313
end
1414

1515
# Attempt to compile
16-
path = compile_executable(interop, (Int64, Ptr{Ptr{UInt8}}), "./", c_flags=`-ldl -lm`)
16+
path = compile_executable(interop, (Int64, Ptr{Ptr{UInt8}}), "./",cflags=`-ldl -lm`)

0 commit comments

Comments
 (0)