mirror of
https://github.com/jimeh/build-emacs-for-macos.git
synced 2026-02-19 06:06:40 +00:00
fix(embedding): embedding GCC fails when paths do not require sanitizing
It seems homebrew bottle of GCC for macOS Monterey (12.0) have changed their directory structure slightly, which caused an issue were we were trying to rename a specific directory to the same name it already had. This behavior is still required as it looks like GCC on macOS Catalina (10.15), the GCC homebrew bottle still uses the old directory structure.
This commit is contained in:
@@ -966,7 +966,9 @@ class GccLibEmbedder < AbstractEmbedder
|
||||
FileUtils.cp_r(source_dir, target_dir)
|
||||
FileUtils.rm(Dir[File.join(target_dir, '**', '.DS_Store')], force: true)
|
||||
FileUtils.chmod_R('u+w', target_dir)
|
||||
FileUtils.mv(source_darwin_dir, target_darwin_dir)
|
||||
if source_darwin_dir != target_darwin_dir
|
||||
FileUtils.mv(source_darwin_dir, target_darwin_dir)
|
||||
end
|
||||
|
||||
env_setup = ERB.new(NATIVE_COMP_ENV_VAR_TPL).result(gcc_info.get_binding)
|
||||
return if File.exist?(site_start_el_file) &&
|
||||
|
||||
Reference in New Issue
Block a user