diff --git a/Library/Homebrew/extend/ENV/std.rb b/Library/Homebrew/extend/ENV/std.rb
index 1f636ac45f..17912cc6bc 100644
--- a/Library/Homebrew/extend/ENV/std.rb
+++ b/Library/Homebrew/extend/ENV/std.rb
@@ -39,7 +39,7 @@ module Stdenv
       self['CPPFLAGS'] = "-isystem#{HOMEBREW_PREFIX}/include"
       self['LDFLAGS'] = "-L#{HOMEBREW_PREFIX}/lib"
       # CMake ignores the variables above
-      self['CMAKE_PREFIX_PATH'] = "#{HOMEBREW_PREFIX}"
+      self['CMAKE_PREFIX_PATH'] = HOMEBREW_PREFIX.to_s
     end
 
     frameworks = HOMEBREW_PREFIX.join("Frameworks")
@@ -74,10 +74,10 @@ module Stdenv
 
   def determine_pkg_config_libdir
     paths = []
-    paths << HOMEBREW_PREFIX/'lib/pkgconfig'
-    paths << HOMEBREW_PREFIX/'share/pkgconfig'
-    paths << HOMEBREW_REPOSITORY/"Library/ENV/pkgconfig/#{MacOS.version}"
-    paths << '/usr/lib/pkgconfig'
+    paths << "#{HOMEBREW_PREFIX}/lib/pkgconfig"
+    paths << "#{HOMEBREW_PREFIX}/share/pkgconfig"
+    paths << "#{HOMEBREW_LIBRARY}/ENV/pkgconfig/#{MacOS.version}"
+    paths << "/usr/lib/pkgconfig"
     paths.select { |d| File.directory? d }.join(File::PATH_SEPARATOR)
   end
 
@@ -157,7 +157,7 @@ module Stdenv
         delete('CMAKE_PREFIX_PATH')
       else
         # It was set in setup_build_environment, so we have to restore it here.
-        self['CMAKE_PREFIX_PATH'] = "#{HOMEBREW_PREFIX}"
+        self['CMAKE_PREFIX_PATH'] = HOMEBREW_PREFIX.to_s
       end
       remove 'CMAKE_FRAMEWORK_PATH', "#{sdk}/System/Library/Frameworks"
     end
diff --git a/Library/Homebrew/extend/ENV/super.rb b/Library/Homebrew/extend/ENV/super.rb
index c7c7a994b2..34137729fa 100644
--- a/Library/Homebrew/extend/ENV/super.rb
+++ b/Library/Homebrew/extend/ENV/super.rb
@@ -45,9 +45,9 @@ module Superenv
     self['PKG_CONFIG_LIBDIR'] = determine_pkg_config_libdir
     self['HOMEBREW_CCCFG'] = determine_cccfg
     self['HOMEBREW_OPTIMIZATION_LEVEL'] = 'Os'
-    self['HOMEBREW_BREW_FILE'] = HOMEBREW_BREW_FILE
-    self['HOMEBREW_PREFIX'] = HOMEBREW_PREFIX
-    self['HOMEBREW_TEMP'] = HOMEBREW_TEMP
+    self['HOMEBREW_BREW_FILE'] = HOMEBREW_BREW_FILE.to_s
+    self['HOMEBREW_PREFIX'] = HOMEBREW_PREFIX.to_s
+    self['HOMEBREW_TEMP'] = HOMEBREW_TEMP.to_s
     self['HOMEBREW_SDKROOT'] = "#{MacOS.sdk_path}" if MacOS::Xcode.without_clt?
     self['HOMEBREW_OPTFLAGS'] = determine_optflags
     self['HOMEBREW_ARCHFLAGS'] = ''