mirror of
https://github.com/chromebrew/chromebrew.git
synced 2026-01-08 23:18:10 -05:00
Change to add -j flag at only compile-time
This commit is contained in:
2
crew
2
crew
@@ -218,7 +218,9 @@ end
|
||||
def build_and_preconfigure (target_dir)
|
||||
Dir.chdir target_dir do
|
||||
puts "Building from source, this may take a while..."
|
||||
@pkg.in_build = true
|
||||
@pkg.build
|
||||
@pkg.in_build = false
|
||||
system "rm -rf", CREW_DEST_DIR + "/*" #wipe crew destdir
|
||||
puts "Preconfiguring package..."
|
||||
@pkg.install
|
||||
|
||||
@@ -5,7 +5,7 @@ class Package
|
||||
|
||||
class << self
|
||||
attr_reader :dependencies, :is_fake
|
||||
attr_accessor :name
|
||||
attr_accessor :name, :in_build
|
||||
end
|
||||
def self.depends_on (dependency = nil)
|
||||
@dependencies = [] unless @dependencies
|
||||
@@ -28,13 +28,15 @@ class Package
|
||||
end
|
||||
|
||||
def self.system(*args)
|
||||
# add "-j#{CREW_NPROC}" argument to "make"
|
||||
if args[0] == "make"
|
||||
# modify ["make", "args", ...] into ["make", "-j#{CREW_NPROC}", "args", ...]
|
||||
args.insert(1, "-j#{CREW_NPROC}")
|
||||
elsif args.length == 1
|
||||
# modify ["make args..."] into ["make -j#{CREW_NPROC} args..."]
|
||||
args[0].gsub!(/^make /, "make -j#{CREW_NPROC} ")
|
||||
# add "-j#{CREW_NPROC}" argument to "make" at only compile-time
|
||||
if @in_build == true
|
||||
if args[0] == "make"
|
||||
# modify ["make", "args", ...] into ["make", "-j#{CREW_NPROC}", "args", ...]
|
||||
args.insert(1, "-j#{CREW_NPROC}")
|
||||
elsif args.length == 1
|
||||
# modify ["make args..."] into ["make -j#{CREW_NPROC} args..."]
|
||||
args[0].gsub!(/^make /, "make -j#{CREW_NPROC} ")
|
||||
end
|
||||
end
|
||||
Kernel.system(*args)
|
||||
exitstatus = $?.exitstatus
|
||||
|
||||
Reference in New Issue
Block a user