From 59188aee977492c321a2d2677f102038a2023f8c Mon Sep 17 00:00:00 2001 From: Andy Ragusa Date: Fri, 9 Feb 2024 11:08:00 -0800 Subject: [PATCH] Hopefully fixes tests on github --- clambcc/clambc-compiler.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/clambcc/clambc-compiler.py b/clambcc/clambc-compiler.py index 2ebb66ca10..b0ee9f6021 100755 --- a/clambcc/clambc-compiler.py +++ b/clambcc/clambc-compiler.py @@ -51,16 +51,18 @@ SHARED_OBJ_DIR = Path(__file__).parent / '..' / 'lib' if (SHARED_OBJ_DIR / 'libclambccommon.so').exists(): - SHARED_OBJ_FILE = SHARED_OBJ_DIR / 'libclambcc.so' + #SHARED_OBJ_FILE = SHARED_OBJ_DIR / 'libclambcc.so' FOUND_SHARED_OBJ = True elif 'LD_LIBRARY_PATH' in os.environ: # Use LD_LIBRARY_PATH to try to find it. ld_library_paths = os.environ['LD_LIBRARY_PATH'].strip(' :').split(':') for lib_path in ld_library_paths: - if (Path(lib_path) / 'libclambcc.so').exists(): - SHARED_OBJ_FILE = Path(lib_path) / 'libclambcc.so' + if (Path(lib_path) / 'libclambcccommon.so').exists(): + #SHARED_OBJ_FILE = Path(lib_path) / 'libclambcccommon.so' + SHARED_OBJ_DIR = Path(lib_path) FOUND_SHARED_OBJ = True + break VERBOSE=False @@ -859,7 +861,7 @@ def main(): options.passthroughOptions = parser.getPassthrough() if not FOUND_SHARED_OBJ: - die(f"libclambcc.so not found. See instructions for building", 2) + die(f"Shared objects not found. See instructions for building", 2) if 0 == len(args): dieNoInputFile()