diff options
| -rwxr-xr-x | check.py | 2 | ||||
| -rw-r--r-- | scripts/test/shared.py | 9 |
2 files changed, 10 insertions, 1 deletions
@@ -292,7 +292,7 @@ def run_gcc_tests(): src = os.path.join(shared.get_test_dir('example'), t) expected = os.path.join(shared.get_test_dir('example'), '.'.join(t.split('.')[:-1]) + '.txt') # build the C file separately - libpath = os.path.join(os.path.dirname(shared.options.binaryen_bin), 'lib') + libpath = shared.options.binaryen_lib extra = [shared.NATIVECC, src, '-c', '-o', 'example.o', '-I' + os.path.join(shared.options.binaryen_root, 'src'), '-g', '-L' + libpath, '-pthread'] if src.endswith('.cpp'): diff --git a/scripts/test/shared.py b/scripts/test/shared.py index b443f4250..720ad2aa9 100644 --- a/scripts/test/shared.py +++ b/scripts/test/shared.py @@ -55,6 +55,10 @@ def parse_args(args): ' If not specified, the environment variable BINARYEN_ROOT= can also' ' be used to adjust this.')) parser.add_argument( + '--binaryen-lib', dest='binaryen_lib', default='', + help=('Specifies a path to where the built Binaryen shared library resides at.' + ' Default: ./lib relative to bin specified above.')) + parser.add_argument( '--binaryen-root', dest='binaryen_root', default='', help=('Specifies a path to the root of the Binaryen repository tree.' ' Default: the directory where this file check.py resides.')) @@ -120,6 +124,11 @@ if not options.binaryen_bin: options.binaryen_bin = os.path.normpath(os.path.abspath(options.binaryen_bin)) +if not options.binaryen_lib: + options.binaryen_lib = os.path.join(os.path.dirname(options.binaryen_bin), 'lib') + +options.binaryen_lib = os.path.normpath(os.path.abspath(options.binaryen_lib)) + # ensure BINARYEN_ROOT is set up os.environ['BINARYEN_ROOT'] = os.path.dirname(options.binaryen_bin) |