Skip to content

Commit

Permalink
Store the make to use in a variable and default to gmake on *BSD plat…
Browse files Browse the repository at this point in the history
…forms
  • Loading branch information
dbussink committed Mar 14, 2011
1 parent 7363834 commit 457e27d
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions rakelib/blueprint.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
gcc.ldflags << "-lstdc++"
gcc.ldflags << "-L/usr/local/lib -L/opt/local/lib"

make = "make"

# TODO: Fix with Platform object
case RUBY_PLATFORM
when /linux/i
Expand All @@ -47,6 +49,7 @@
gcc.ldflags << "-ldl" << "-lnetwork"
when /bsd/i
gcc.ldflags << "-ldl" << "-lcrypt" << "-rdynamic"
make = "gmake"
when /mingw|win32/i
gcc.ldflags << "-lws2_32"
else
Expand Down Expand Up @@ -113,7 +116,7 @@
l.cflags = ["-Ivm/external_libs/libtommath"]
l.objects = [l.file("libtommath.a")]
l.to_build do |x|
x.command "make"
x.command make
end
end

Expand All @@ -122,15 +125,15 @@
l.objects = [l.file(".libs/libonig.a")]
l.to_build do |x|
x.command "./configure" unless File.exists?("Makefile")
x.command "make"
x.command make
end
end

gdtoa = i.external_lib "vm/external_libs/libgdtoa" do |l|
l.cflags = ["-Ivm/external_libs/libgdtoa"]
l.objects = [l.file("libgdtoa.a")]
l.to_build do |x|
x.command "make"
x.command make
end
end

Expand All @@ -139,7 +142,7 @@
l.objects = [l.file(".libs/libffi.a")]
l.to_build do |x|
x.command "./configure" unless File.exists?("Makefile")
x.command "make"
x.command make
end
end

Expand All @@ -148,7 +151,7 @@
l.objects = [l.file("libudis86/.libs/libudis86.a")]
l.to_build do |x|
x.command "./configure" unless File.exists?("Makefile")
x.command "make"
x.command make
end
end

Expand All @@ -165,7 +168,7 @@
l.objects = [l.file("libpthread.a")]
l.to_build do |x|
x.command "./configure" unless File.exists?("Makefile")
x.command "make"
x.command make
end
end

Expand Down

0 comments on commit 457e27d

Please sign in to comment.