Created
April 25, 2016 17:23
-
-
Save mingwandroid/c6ca9664681c030edc4ebbc63eb92e80 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/conda_build/external.py b/conda_build/external.py | |
index 50d1d11..3f558b4 100644 | |
--- a/conda_build/external.py | |
+++ b/conda_build/external.py | |
@@ -14,8 +14,12 @@ def find_executable(executable): | |
if sys.platform == 'win32': | |
dir_paths = [join(config.build_prefix, 'Scripts'), | |
join(config.build_prefix, 'Library\\bin'), | |
+ join(config.build_prefix, 'Library\\mingw-w64\\bin'), | |
+ join(config.build_prefix, 'Library\\usr\\bin'), | |
join(cc.root_dir, 'Scripts'), | |
join(cc.root_dir, 'Library\\bin'), | |
+ join(cc.root_dir, 'Library\\mingw-w64\\bin'), | |
+ join(cc.root_dir, 'Library\\usr\\bin'), | |
'C:\\cygwin\\bin'] | |
else: | |
dir_paths = [join(config.build_prefix, 'bin'), | |
diff --git a/conda_build/scripts.py b/conda_build/scripts.py | |
index 3ffd422..ad67403 100644 | |
--- a/conda_build/scripts.py | |
+++ b/conda_build/scripts.py | |
@@ -63,7 +63,7 @@ def create_entry_points(items): | |
def prepend_bin_path(env, prefix, prepend_prefix=False): | |
env['PATH'] = join(prefix, bin_dirname) + os.pathsep + env['PATH'] | |
if sys.platform == "win32": | |
- env['PATH'] = join(prefix, "Library", "bin") + os.pathsep + env['PATH'] | |
+ env['PATH'] = join(prefix, "Library", "bin") + os.pathsep + join(prefix, "Library", "mingw-w64", "bin") + os.pathsep + join(prefix, "Library", "usr", "bin") + os.pathsep + env['PATH'] | |
if prepend_prefix: | |
env['PATH'] = prefix + os.pathsep + env['PATH'] | |
return env |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment