Skip to content

Commit

Permalink
Workaround for Windows ABI mismatch
Browse files Browse the repository at this point in the history
  • Loading branch information
Gnimuc committed Mar 10, 2019
1 parent 9061ae0 commit cc9dd95
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions deps/build_libcxxffi.jl
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@ download_info = Dict(

# Install unsatisfied or updated dependencies:
unsatisfied = any(!satisfied(p; verbose=verbose) for p in products)
dl_info = choose_download(download_info, platform_key_abi())
@static if Sys.iswindows()
dl_info = download_info[Windows(Sys.WORD_SIZE == 64 ? :x86_64 : :i686, compiler_abi=CompilerABI(:gcc7))]
else
dl_info = choose_download(download_info, platform_key_abi())
end
if dl_info === nothing && unsatisfied
# If we don't have a compatible .tar.gz to download, complain.
# Alternatively, you could attempt to install from a separate provider,
Expand All @@ -29,5 +33,9 @@ end
# trying to install is not itself installed) then load it up!
if unsatisfied || !isinstalled(dl_info...; prefix=prefix)
# Download and install binaries
install(dl_info...; prefix=prefix, force=true, verbose=verbose)
@static if Sys.iswindows()
install(dl_info...; prefix=prefix, force=true, verbose=verbose, ignore_platform=true)
else
install(dl_info...; prefix=prefix, force=true, verbose=verbose)
end
end

0 comments on commit cc9dd95

Please sign in to comment.