admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #18284 from Homebrew/ninja-parallelism

Browse Source
This commit is contained in:
Carlo Cabrera 2024-09-09 11:09:23 +08:00 committed by GitHub
commit 1ac73f44d8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Homebrew/extend/ENV/super.rb
View File

@ -75,6 +75,7 @@ module Superenv
self["HOMEBREW_TEMP"] = HOMEBREW_TEMP.to_s self["HOMEBREW_TEMP"] = HOMEBREW_TEMP.to_s
self["HOMEBREW_OPTFLAGS"] = determine_optflags self["HOMEBREW_OPTFLAGS"] = determine_optflags
self["HOMEBREW_ARCHFLAGS"] = "" self["HOMEBREW_ARCHFLAGS"] = ""
self["HOMEBREW_MAKE_JOBS"] = determine_make_jobs.to_s
self["CMAKE_PREFIX_PATH"] = determine_cmake_prefix_path self["CMAKE_PREFIX_PATH"] = determine_cmake_prefix_path
self["CMAKE_FRAMEWORK_PATH"] = determine_cmake_frameworks_path self["CMAKE_FRAMEWORK_PATH"] = determine_cmake_frameworks_path
self["CMAKE_INCLUDE_PATH"] = determine_cmake_include_path self["CMAKE_INCLUDE_PATH"] = determine_cmake_include_path
@ -313,16 +314,19 @@ module Superenv
# When passed a block, MAKEFLAGS is removed only for the duration of the block and is restored after its completion. # When passed a block, MAKEFLAGS is removed only for the duration of the block and is restored after its completion.
sig { params(block: T.nilable(T.proc.returns(T.untyped))).returns(T.untyped) } sig { params(block: T.nilable(T.proc.returns(T.untyped))).returns(T.untyped) }
def deparallelize(&block) def deparallelize(&block)
old = delete("MAKEFLAGS") old_makeflags = delete("MAKEFLAGS")
old_make_jobs = delete("HOMEBREW_MAKE_JOBS")
self["HOMEBREW_MAKE_JOBS"] = "1"
if block if block
begin begin
yield yield
ensure ensure
self["MAKEFLAGS"] = old self["MAKEFLAGS"] = old_makeflags
self["HOMEBREW_MAKE_JOBS"] = old_make_jobs
end end
end end
old old_makeflags
end end
sig { returns(Integer) } sig { returns(Integer) }

8
Library/Homebrew/shims/super/ninja
View File

@ -11,9 +11,15 @@ fi
source "${HOMEBREW_LIBRARY}/Homebrew/shims/utils.sh" source "${HOMEBREW_LIBRARY}/Homebrew/shims/utils.sh"
parallel_args=()
if [[ -n "${HOMEBREW_MAKE_JOBS}" ]]
then
parallel_args+=(-j "${HOMEBREW_MAKE_JOBS}")
fi
# shellcheck disable=SC2154 # shellcheck disable=SC2154
export HOMEBREW_CCCFG="O${HOMEBREW_CCCFG}" export HOMEBREW_CCCFG="O${HOMEBREW_CCCFG}"
try_exec_non_system "ninja" "$@" try_exec_non_system "ninja" "${parallel_args[@]}" "$@"
echo "ninja: Shim failed to find ninja in PATH." echo "ninja: Shim failed to find ninja in PATH."
exit 1 exit 1