diff options
| author | Amos Wenger | 2013-08-15 21:50:13 +0200 |
|---|---|---|
| committer | Jack Nagel | 2013-08-19 13:35:44 -0500 |
| commit | 13c2776795a4cb233924914b558bab9a5e4beea2 (patch) | |
| tree | 3260352c9c7230683320294b612ba6e9738011a1 /Library/Homebrew/python_helper.rb | |
| parent | 1c991b249ef58ba77f17431e108782b0adb7ceae (diff) | |
| download | homebrew-13c2776795a4cb233924914b558bab9a5e4beea2.tar.bz2 | |
Use File::PATH_SEPARATOR globally instead of ':'
On Unix, the path separator is ':', whereas on Windows,
it is ';'. This is the first of a series of patch to bring
macbrew's and winbrew's codebases closer together.
The main places the magic constant ':' was being used were:
- the $PATH environment variable
- CMAKE-related environment variables
- pkg-config related environment variables
Closes #21921.
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library/Homebrew/python_helper.rb')
| -rw-r--r-- | Library/Homebrew/python_helper.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Library/Homebrew/python_helper.rb b/Library/Homebrew/python_helper.rb index cb2e5d989..30eddb7c0 100644 --- a/Library/Homebrew/python_helper.rb +++ b/Library/Homebrew/python_helper.rb @@ -62,11 +62,11 @@ def python_helper(options={:allowed_major_versions => [2, 3]}, &block) # so that lib points to the HOMEBREW_PREFIX/Cellar/<formula>/<version>/lib puts "brew: Prepending to PYTHONPATH: #{py.site_packages}" if ARGV.verbose? mkdir_p py.site_packages - ENV.prepend 'PYTHONPATH', py.site_packages, ':' + ENV.prepend 'PYTHONPATH', py.site_packages, File::PATH_SEPARATOR ENV['PYTHON'] = py.binary - ENV.prepend 'CMAKE_INCLUDE_PATH', py.incdir, ':' - ENV.prepend 'PKG_CONFIG_PATH', py.pkg_config_path, ':' if py.pkg_config_path - ENV.prepend 'PATH', py.binary.dirname, ':' unless py.from_osx? + ENV.prepend 'CMAKE_INCLUDE_PATH', py.incdir, File::PATH_SEPARATOR + ENV.prepend 'PKG_CONFIG_PATH', py.pkg_config_path, File::PATH_SEPARATOR if py.pkg_config_path + ENV.prepend 'PATH', py.binary.dirname, File::PATH_SEPARATOR unless py.from_osx? #Note: Don't set LDFLAGS to point to the Python.framework, because # it breaks builds (for example scipy.) |