Skip to content

Commit

Permalink
Ensure libtce.so in the build dir is tested, not an installed one.
Browse files Browse the repository at this point in the history
The current fix to #91 breaks
build dir execution when one has an installed libtce.so. This
is because it makes LD_LIBRARY_PATH the preference (which could
point to a custom library location with a libtce.so) instead
of the build dir one, like the libtool wrapper is expected
to do.
  • Loading branch information
pjaaskel committed Nov 1, 2020
1 parent 1ea7c81 commit f74473b
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions tce/tools/scripts/systemtest.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -!- coding: utf-8 -!-
"""
Copyright (c) 2011-2015 Pekka Jääskeläinen / Tampere University.
Copyright (c) 2011-2020 Pekka Jääskeläinen / Tampere University.
This file is part of TTA-Based Codesign Environment (TCE).
Expand Down Expand Up @@ -720,11 +720,11 @@ def setup_exec_env():
for include in includedirs:
cpp_flags += "-I" + os.path.join(bld_root, include) + " "

lib_tce_dir = os.path.join(bld_root, 'src')
lib_tce_dir = os.path.join(bld_root, 'src/.libs')

os.environ['TCE_LDFLAGS'] = "-L" + lib_tce_dir
os.environ['TCE_CPPFLAGS'] = cpp_flags
os.environ['TCE_LD_LIBRARY_PATH'] = lib_tce_dir
os.environ['LD_LIBRARY_PATH'] = lib_tce_dir + ":" + os.environ.get('LD_LIBRARY_PATH', '')
os.environ['TCE_BUILD_ROOT'] = bld_root
os.environ['ORIGINALPATH'] = os.environ['PATH']
os.environ['PATH'] = tce_path_env + os.environ['PATH']
Expand Down

0 comments on commit f74473b

Please sign in to comment.