github/chromebrew
1
1
Fork 0
mirror of https://github.com/chromebrew/chromebrew.git synced 2026-01-10 07:57:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use 'mold -run' in builtsystems when mold is CREW_LINKER (#8468)

Browse Source 
* Use 'mold -run' in builtsystems when mold is CREW_LINKER

* simplify logic
This commit is contained in:
Satadru Pramanik, DO, MPH, MEng
2023-07-10 13:29:48 -04:00
committed by GitHub
parent 8737f59bf1
commit ae6f80eb9b
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/buildsystems/autotools.rb
View File

@@ -28,7 +28,8 @@ class Autotools < Package
puts 'Using filefix.'.orange
system 'filefix'
end
system "./configure #{CREW_OPTIONS} #{@configure_options}"
@mold_linker_prefix_cmd = CREW_LINKER == 'mold' ? 'mold -run ' : ''
system "#{@mold_linker_prefix_cmd}./configure #{CREW_OPTIONS} #{@configure_options}"
system 'make'
end

3
lib/buildsystems/cmake.rb
View File

@@ -12,7 +12,8 @@ class CMake < Package
def self.build
puts "Additional cmake_options being used: #{@cmake_options.nil? || @cmake_options.empty? ? '<no cmake_options>' : @cmake_options}".orange
@crew_cmake_options = no_lto ? CREW_CMAKE_FNO_LTO_OPTIONS : CREW_CMAKE_OPTIONS
system "cmake -B builddir -G Ninja #{@crew_cmake_options} #{@cmake_options}"
@mold_linker_prefix_cmd = CREW_LINKER == 'mold' ? 'mold -run ' : ''
system "#{@mold_linker_prefix_cmd}cmake -B builddir -G Ninja #{@crew_cmake_options} #{@cmake_options}"
system "#{CREW_NINJA} -C builddir"
end

3
lib/buildsystems/meson.rb
View File

@@ -12,7 +12,8 @@ class Meson < Package
def self.build
puts "Additional meson_options being used: #{@meson_options.nil? || @meson_options.empty? ? '<no meson_options>' : @meson_options}".orange
@crew_meson_options = no_lto ? CREW_MESON_FNO_LTO_OPTIONS : CREW_MESON_OPTIONS
system "meson setup #{@crew_meson_options} #{@meson_options} builddir"
@mold_linker_prefix_cmd = CREW_LINKER == 'mold' ? 'mold -run ' : ''
system "#{@mold_linker_prefix_cmd}meson setup #{@crew_meson_options} #{@meson_options} builddir"
system 'meson configure builddir'
system "#{CREW_NINJA} -C builddir"
end

2
lib/const.rb
View File

@@ -1,5 +1,5 @@
# Defines common constants used in different parts of crew
CREW_VERSION = '1.35.0'
CREW_VERSION = '1.35.1'
# kernel architecture
KERN_ARCH = `uname -m`.chomp