diff options
| author | Jay Phelps <hello@jayphelps.com> | 2018-08-30 10:07:56 -0400 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2018-08-30 07:07:56 -0700 |
| commit | 6e80adefb1605f3ca76d5a2f77a4ea65bf5acaee (patch) | |
| tree | 12aa05f21163cd63853fa7eb004319ed216206ce | |
| parent | 9723f53ec46ad83e3ff8c89b60eb64a71a8eb74c (diff) | |
| download | binaryen-6e80adefb1605f3ca76d5a2f77a4ea65bf5acaee.tar.gz binaryen-6e80adefb1605f3ca76d5a2f77a4ea65bf5acaee.tar.bz2 binaryen-6e80adefb1605f3ca76d5a2f77a4ea65bf5acaee.zip | |
use comma for -rpath instead of equals sign to fix MacOS (#1651)
on MacOS with gcc-8 the equals sign -rpath= is invalid. Best I can tell a comma can be used instead -rpath, more cross-platform, but only Travis will tell us +1
I think this fixes #1185 provided you install real GCC (Mac has clang pretend to be gcc) and provide it CC=gcc-8 CXX=g++-8 ./check.py.
| -rwxr-xr-x | auto_update_tests.py | 2 | ||||
| -rwxr-xr-x | check.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/auto_update_tests.py b/auto_update_tests.py index 181eb5696..a291421d5 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(' '): @@ -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 |