diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rwxr-xr-x | check.py | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore index 51ddab3c8..ba8eb09c5 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,7 @@ bin/wasm2asm bin/s2wasm bin/wasm-as bin/wasm-dis -lib/libbinaryen-c.so +lib/libbinaryen.so *.a *~ *.diff diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ecc51a9c..3f8121a21 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -96,13 +96,13 @@ ADD_SUBDIRECTORY(src/support) # Sources. -SET(binaryen_c_SOURCES +SET(binaryen_SOURCES src/binaryen-c.cpp src/cfg/Relooper.cpp src/wasm.cpp ) -ADD_LIBRARY(binaryen-c SHARED ${binaryen_c_SOURCES}) -TARGET_LINK_LIBRARIES(binaryen-c asmjs ${all_passes} support) +ADD_LIBRARY(binaryen SHARED ${binaryen_SOURCES}) +TARGET_LINK_LIBRARIES(binaryen asmjs ${all_passes} support) SET(binaryen-shell_SOURCES src/binaryen-shell.cpp @@ -610,7 +610,7 @@ for t in sorted(os.listdir(os.path.join('test', 'example'))): print ' '.join(extra) subprocess.check_call(extra) # Link against the binaryen C library DSO, using an executable-relative rpath - cmd = ['example.o', '-lbinaryen-c'] + cmd + ['-Wl,-rpath=$ORIGIN/../lib'] + cmd = ['example.o', '-lbinaryen'] + cmd + ['-Wl,-rpath=$ORIGIN/../lib'] else: continue if os.environ.get('COMPILER_FLAGS'): |