diff --git a/Brewfile b/Brewfile index 26ab78d..bf33dbd 100644 --- a/Brewfile +++ b/Brewfile @@ -1,5 +1,6 @@ # frozen_string_literal: true +brew 'coreutils' brew 'curl' brew 'expat' brew 'gmp' @@ -14,6 +15,7 @@ brew 'libunistring' brew 'libxml2' brew 'little-cms2' brew 'mailutils' +brew 'make' brew 'ncurses' brew 'nettle' brew 'pkg-config' diff --git a/build-emacs-for-macos b/build-emacs-for-macos index d88eb60..4795616 100755 --- a/build-emacs-for-macos +++ b/build-emacs-for-macos @@ -209,6 +209,8 @@ class Build ].compact.join(':') ENV['PATH'] = [ + "#{brew_dir}/opt/make/libexec/gnubin", + "#{brew_dir}/opt/coreutils/libexec/gnubin", "#{brew_dir}/opt/gnu-sed/libexec/gnubin", "#{brew_dir}/bin", "#{brew_dir}/opt/texinfo/bin", @@ -225,9 +227,6 @@ class Build configure_flags << '--with-xwidgets' if supports_xwidgets? configure_flags << '--with-nativecomp' if options[:native_comp] - make_flags = [] - make_flags += ['-j', options[:parallel].to_s] if options[:parallel] - run_cmd './configure', *configure_flags # Disable aligned_alloc on Mojave and below. See issue: @@ -237,6 +236,9 @@ class Build disable_alligned_alloc end + make_flags = [] + make_flags += ['-j', options[:parallel].to_s] if options[:parallel] + if options[:native_comp] make_flags << "BYTE_COMPILE_EXTRA_FLAGS=--eval '(setq comp-speed 2)'" end