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

Put the GCC DLL replacement back #97

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Put the GCC DLL replacement back #97

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ff07478
Revert "Remove the gcc dll replacement for now"
tkelman Mar 28, 2016
0eb838f
fix windows_only and ASCIIString deprecations
tkelman Jan 25, 2017
d95af59
Add libwinpthread-1 to dll replacement
tkelman Jan 25, 2017
83313ae
account for the possibility that winpthread-1.dll doesn't exist yet
tkelman Jan 31, 2017
ae4f56c
libgfortran-4, readstring instead of readall
tkelman Aug 5, 2017
8a78f47
don't need to copy nonexistent files
tkelman Aug 5, 2017
94fc365
use Compat.SYS.WORD_SIZE
tkelman Aug 5, 2017
978ef66
just Sys.WORD_SIZE, does that work?
tkelman Aug 5, 2017
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
2 changes: 1 addition & 1 deletion deps/build.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ if is_windows()
winrpm_bin = joinpath(WinRPM.installdir, "usr", Sys.MACHINE,
"sys-root", "mingw", "bin")
dlls = ["libgfortran-4", "libquadmath-0", "libstdc++-6", "libwinpthread-1",
"libssp-0", Compat.Sys.WORD_SIZE==32 ? "libgcc_s_sjlj-1" : "libgcc_s_seh-1"]
"libssp-0", Sys.WORD_SIZE==32 ? "libgcc_s_sjlj-1" : "libgcc_s_seh-1"]
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

WORD_SIZE was exported Base symbol so it was available in the Sys module even before it was moved there.

dlls_to_download = Compat.String[]
for lib in dlls
if !isfile(joinpath(winrpm_bin, lib * ".dll"))
Expand Down