diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | tests/tools/run-bindgen.py | 8 |
2 files changed, 8 insertions, 2 deletions
@@ -9,7 +9,7 @@ BINDGEN := ./target/debug/bindgen .PHONY: $(BINDGEN) $(BINDGEN): - [ -f $@ ] || cargo build + [ -f $@ ] || cargo build --features llvm_stable .PHONY: test test: regen-tests diff --git a/tests/tools/run-bindgen.py b/tests/tools/run-bindgen.py index 50e96d95..2054924f 100755 --- a/tests/tools/run-bindgen.py +++ b/tests/tools/run-bindgen.py @@ -27,7 +27,13 @@ for line in COMMON_PRELUDE.split('\n'): base_command.extend(flags); base_command.append(sys.argv[2]); -subprocess.check_call(base_command, cwd=os.getcwd()) +env = os.environ.copy() + +# El Capitan likes to unset dyld variables +# https://forums.developer.apple.com/thread/9233 +if "DYLD_LIBRARY_PATH" not in env and "LIBCLANG_PATH" in env: + env["DYLD_LIBRARY_PATH"] = env["LIBCLANG_PATH"] +subprocess.check_call(base_command, cwd=os.getcwd(), env=env) name = None |