diff --git a/lib/buildsystems/cmake.rb b/lib/buildsystems/cmake.rb index 9147aaa9f..478daa85e 100644 --- a/lib/buildsystems/cmake.rb +++ b/lib/buildsystems/cmake.rb @@ -11,9 +11,9 @@ class CMake < Package def self.build puts "Additional cmake_options being used: #{@cmake_options.nil? || @cmake_options.empty? ? '' : @cmake_options}".orange - @crew_cmake_options = no_lto ? CREW_CMAKE_FNO_LTO_OPTIONS : CREW_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}" + @crew_cmake_options = @no_lto ? CREW_CMAKE_FNO_LTO_OPTIONS : CREW_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 diff --git a/lib/buildsystems/meson.rb b/lib/buildsystems/meson.rb index d09d6d1e8..e19b603f5 100644 --- a/lib/buildsystems/meson.rb +++ b/lib/buildsystems/meson.rb @@ -11,9 +11,9 @@ class Meson < Package def self.build puts "Additional meson_options being used: #{@meson_options.nil? || @meson_options.empty? ? '' : @meson_options}".orange - @crew_meson_options = no_lto ? CREW_MESON_FNO_LTO_OPTIONS : CREW_MESON_OPTIONS - @mold_linker_prefix_cmd = CREW_LINKER == 'mold' ? 'mold -run ' : '' - system "#{@mold_linker_prefix_cmd}meson setup #{@crew_meson_options} #{@meson_options} builddir" + @crew_meson_options = @no_lto ? CREW_MESON_FNO_LTO_OPTIONS : CREW_MESON_OPTIONS + @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 diff --git a/lib/const.rb b/lib/const.rb index d8ad0c990..9fc1a0dc5 100644 --- a/lib/const.rb +++ b/lib/const.rb @@ -1,5 +1,5 @@ # Defines common constants used in different parts of crew -CREW_VERSION = '1.35.1' +CREW_VERSION = '1.35.2' # kernel architecture KERN_ARCH = `uname -m`.chomp