mgorny updated this revision to Diff 188946.
mgorny retitled this revision from "[lldb] [test] Pass appropriate -L for
just-built libc++" to "[lldb] [test] Pass appropriate -L&-Wl,-rpath for
just-built libc++".
mgorny edited the summary of this revision.
mgorny added a comment.
Turns out LD_LIBRARY_PATH does not solve all the issues on NetBSD. I've went
ahead with the simplest solution possible, and added `-Wl,-rpath` (only on
NetBSD) along with `-L` flags.
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D58630/new/
https://reviews.llvm.org/D58630
Files:
lldb/lit/BuildScript/toolchain-clang.test
lldb/lit/Suite/lit.cfg
lldb/lit/helper/build.py
lldb/lit/helper/toolchain.py
lldb/packages/Python/lldbsuite/test/make/Makefile.rules
Index: lldb/packages/Python/lldbsuite/test/make/Makefile.rules
===================================================================
--- lldb/packages/Python/lldbsuite/test/make/Makefile.rules
+++ lldb/packages/Python/lldbsuite/test/make/Makefile.rules
@@ -297,6 +297,12 @@
LD = $(CC)
LDFLAGS ?= $(CFLAGS)
LDFLAGS += $(LD_EXTRAS) $(ARCH_LDFLAGS)
+ifneq (,$(LLVM_LIBS_DIR))
+ LDFLAGS += -L$(LLVM_LIBS_DIR)
+ ifeq ($(OS),NetBSD)
+ LDFLAGS += -Wl,-rpath,$(LLVM_LIBS_DIR)
+ endif
+endif
ifeq (,$(filter $(OS), Windows_NT Android Darwin))
ifneq (,$(filter YES,$(ENABLE_THREADS)))
LDFLAGS += -pthread
Index: lldb/lit/helper/toolchain.py
===================================================================
--- lldb/lit/helper/toolchain.py
+++ lldb/lit/helper/toolchain.py
@@ -31,6 +31,8 @@
build_script_args.append('--tools-dir={0}'.format(config.lldb_lit_tools_dir))
if config.lldb_tools_dir:
build_script_args.append('--tools-dir={0}'.format(config.lldb_tools_dir))
+ if config.llvm_libs_dir:
+ build_script_args.append('--libs-dir={0}'.format(config.llvm_libs_dir))
primary_tools = [
ToolSubst('%lldb',
@@ -99,6 +101,10 @@
elif platform.system() in ['OpenBSD', 'Linux']:
flags = ['-pthread']
+ # needed e.g. to use freshly built libc++
+ flags.append('-L' + config.llvm_libs_dir)
+ if sys.platform.startswith('netbsd'):
+ flags.append('-Wl,-rpath,' + config.llvm_libs_dir)
additional_tool_dirs=[]
if config.lldb_lit_tools_dir:
Index: lldb/lit/helper/build.py
===================================================================
--- lldb/lit/helper/build.py
+++ lldb/lit/helper/build.py
@@ -35,6 +35,13 @@
required=True,
help='Path to a compiler executable, or one of the values [any, msvc, clang-cl, gcc, clang]')
+parser.add_argument('--libs-dir',
+ metavar='directory',
+ dest='libs_dir',
+ required=False,
+ action='append',
+ help='If specified, a path to linked libraries to be passed via -L')
+
parser.add_argument('--tools-dir',
metavar='directory',
dest='tools_dir',
@@ -225,6 +232,7 @@
self.nodefaultlib = args.nodefaultlib
self.verbose = args.verbose
self.obj_ext = obj_ext
+ self.lib_paths = args.libs_dir
def _exe_file_name(self):
assert self.mode != 'compile'
@@ -648,6 +656,9 @@
if sys.platform == 'darwin':
main_symbol = '_main'
args.append('-Wl,-e,' + main_symbol)
+ args.extend(['-L' + x for x in self.lib_paths])
+ if sys.platform.startswith('netbsd'):
+ args.extend(['-Wl,-rpath,' + x for x in self.lib_paths])
args.extend(['-o', self._exe_file_name()])
args.extend(self._obj_file_names())
Index: lldb/lit/Suite/lit.cfg
===================================================================
--- lldb/lit/Suite/lit.cfg
+++ lldb/lit/Suite/lit.cfg
@@ -42,6 +42,10 @@
if config.dotest_lit_args_str:
dotest_cmd.extend(shlex.split(config.dotest_lit_args_str))
+# Library path may be needed to locate just-built clang.
+if config.llvm_libs_dir:
+ dotest_cmd += ['--env', 'LLVM_LIBS_DIR=' + config.llvm_libs_dir]
+
# Load LLDB test format.
sys.path.append(os.path.join(config.lldb_src_root, "lit", "Suite"))
import lldbtest
Index: lldb/lit/BuildScript/toolchain-clang.test
===================================================================
--- lldb/lit/BuildScript/toolchain-clang.test
+++ lldb/lit/BuildScript/toolchain-clang.test
@@ -10,5 +10,5 @@
CHECK-32: {{.*}}clang++{{(.exe)?}} -m32 -g -O0 -c -o {{.*}}foo.exe-foobar.o {{.*}}foobar.c
CHECK-64: {{.*}}clang++{{(.exe)?}} -m64 -g -O0 -c -o {{.*}}foo.exe-foobar.o {{.*}}foobar.c
CHECK: linking foo.exe-foobar.o -> foo.exe
-CHECK-32: {{.*}}clang++{{(.exe)?}} -m32 -o {{.*}}foo.exe {{.*}}foo.exe-foobar.o
-CHECK-64: {{.*}}clang++{{(.exe)?}} -m64 -o {{.*}}foo.exe {{.*}}foo.exe-foobar.o
+CHECK-32: {{.*}}clang++{{(.exe)?}} -m32 {{(-L.*)? (-Wl,-rpath,.*)?}} -o {{.*}}foo.exe {{.*}}foo.exe-foobar.o
+CHECK-64: {{.*}}clang++{{(.exe)?}} -m64 {{(-L.*)? (-Wl,-rpath,.*)?}} -o {{.*}}foo.exe {{.*}}foo.exe-foobar.o
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
