Skip to content

Commit

Permalink
Force BinDeps to use binaries, unkosherly reset it after
Browse files Browse the repository at this point in the history
  • Loading branch information
@ararslan
ararslan committed Aug 25, 2017
1 parent 27ee055 commit eb979b7
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions deps/build.jl
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
using BinDeps
using BinDeps: builddir

old_defaults = copy(BinDeps.defaults)
if !in(BinDeps.Binaries, BinDeps.defaults)
prepend!(BinDeps.defaults, BinDeps.Binaries)
end

BinDeps.@setup

const FFTW_VER = v"3.3.6-pl2"
Expand Down Expand Up @@ -103,3 +108,7 @@ if Sys.iswindows()
else
BinDeps.@install Dict([:libfftw3_threads => :libfftw, :libfftw3f_threads => :libfftwf])
end

if old_defaults != BinDeps.defaults
eval(BinDeps, :(defaults = $old_defaults))
end

3 comments on commit eb979b7

@tkelman
Copy link
Contributor

Choose a reason for hiding this comment

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

just push and pop, evaling into a different module isn't great

@ararslan
Copy link
Member Author

Choose a reason for hiding this comment

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

If I push!(BinDeps.defaults, BinDeps.Binaries), that will put it after BuildProcess, so it will still end up building rather than using binaries.

@tkelman
Copy link
Contributor

Choose a reason for hiding this comment

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

shift! and unshift! then

Please sign in to comment.