Skip to content

Commit a4a0306

Browse files
committed
Try dropping DYLD_LIBRARY_PATH
1 parent 294c07b commit a4a0306

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

libcxx/test/configs/apple-libc++-shared.cfg.in

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Testing configuration for Apple's system libc++.
22
#
33
# This configuration differs from a normal LLVM shared library configuration in
4-
# that we must use DYLD_LIBRARY_PATH to run the tests against the just-built library,
5-
# since Apple's libc++ has an absolute install_name.
4+
# that we have a single include directory for the libc++ headers since Apple
5+
# system builds don't use a per-target include directory layout.
66
#
7-
# We also don't use a per-target include directory layout, so we have only one
8-
# include directory for the libc++ headers.
7+
# We also identify the variant of the standard library as 'apple-libc++', which
8+
# enables additional vendor-specific tests.
99

1010
lit_config.load_config(config, '@CMAKE_CURRENT_BINARY_DIR@/cmake-bridge.cfg')
1111

@@ -16,10 +16,10 @@ config.substitutions.append(('%{compile_flags}',
1616
'-nostdinc++ -I %{include-dir} -I %{libcxx-dir}/test/support'
1717
))
1818
config.substitutions.append(('%{link_flags}',
19-
'-nostdlib++ -L %{lib-dir} -lc++'
19+
'-nostdlib++ -L %{lib-dir} -Wl,-rpath,%{lib-dir} -lc++'
2020
))
2121
config.substitutions.append(('%{exec}',
22-
'%{executor} --execdir %T --env DYLD_LIBRARY_PATH=%{lib-dir} -- '
22+
'%{executor} --execdir %T -- '
2323
))
2424

2525
config.stdlib = 'apple-libc++'

0 commit comments

Comments
 (0)