Merge pull request #105 from mistydemeo/build_deps_as_bottles

portable-package: fix building deps as bottles
Homebrew · Jun 16, 2020 · f62039e · f62039e
2 parents 96260d6 + 9c541f3
commit f62039e
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/cmd/portable-package.rb b/cmd/portable-package.rb
@@ -33,15 +33,14 @@ def portable_package
     raise UsageError, "--no-commit requires --write!" if !Homebrew.args.write? && Homebrew.args.no_commit?
 
     ENV["HOMEBREW_DEVELOPER"] = "1"
-    ENV["HOMEBREW_BUILD_BOTTLE"] = "1" if OS.linux?
 
     Homebrew.args.named.each do |name|
       name = "portable-#{name}" unless name.start_with? "portable-"
       begin
-        deps = Utils.popen_read("brew", "deps", "--include-build", name).split("\n")
+        deps = Utils.popen_read("brew", "deps", "-n", "--include-build", name).split("\n")
 
         # Avoid installing glibc. Bottles depend on glibc.
-        safe_system "brew", "install", "-s", *deps if OS.linux?
+        safe_system "brew", "install", "--build-bottle", *deps if OS.linux?
 
         safe_system "brew", "install", "--build-bottle", name
         unless Homebrew.args.no_uninstall_deps?