From 323a1d96050bfa2be7e4122043d7c6b360abc3dc Mon Sep 17 00:00:00 2001 From: Jay Phelps Date: Tue, 28 Aug 2018 21:19:55 -0400 Subject: [PATCH] use comma for -rpath instead of equals sign to fix MacOS --- auto_update_tests.py | 2 +- check.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/auto_update_tests.py b/auto_update_tests.py index 181eb56968f..a291421d5e2 100755 --- a/auto_update_tests.py +++ b/auto_update_tests.py @@ -225,7 +225,7 @@ def update_example_tests(): print os.getcwd() subprocess.check_call(extra) # Link against the binaryen C library DSO, using rpath - cmd = ['example.o', '-L' + libdir, '-lbinaryen', '-Wl,-rpath=' + os.path.abspath(libdir)] + cmd + cmd = ['example.o', '-L' + libdir, '-lbinaryen', '-Wl,-rpath,' + os.path.abspath(libdir)] + cmd print ' ', t, src, expected if os.environ.get('COMPILER_FLAGS'): for f in os.environ.get('COMPILER_FLAGS').split(' '): diff --git a/check.py b/check.py index d78ed022f30..f5e8b104ad1 100755 --- a/check.py +++ b/check.py @@ -547,7 +547,7 @@ def run_gcc_tests(): print 'build: ', ' '.join(extra) subprocess.check_call(extra) # Link against the binaryen C library DSO, using an executable-relative rpath - cmd = ['example.o', '-L' + os.path.join(options.binaryen_bin, '..', 'lib'), '-lbinaryen'] + cmd + ['-Wl,-rpath=$ORIGIN/../lib'] + cmd = ['example.o', '-L' + os.path.join(options.binaryen_bin, '..', 'lib'), '-lbinaryen'] + cmd + ['-Wl,-rpath,$ORIGIN/../lib'] else: continue print ' ', t, src, expected