Skip to content

Commit

Permalink
Try dropping DYLD_LIBRARY_PATH
Browse files Browse the repository at this point in the history
  • Loading branch information
ldionne committed May 23, 2024
1 parent 294c07b commit a4a0306
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions libcxx/test/configs/apple-libc++-shared.cfg.in
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Testing configuration for Apple's system libc++.
#
# This configuration differs from a normal LLVM shared library configuration in
# that we must use DYLD_LIBRARY_PATH to run the tests against the just-built library,
# since Apple's libc++ has an absolute install_name.
# that we have a single include directory for the libc++ headers since Apple
# system builds don't use a per-target include directory layout.
#
# We also don't use a per-target include directory layout, so we have only one
# include directory for the libc++ headers.
# We also identify the variant of the standard library as 'apple-libc++', which
# enables additional vendor-specific tests.

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

Expand All @@ -16,10 +16,10 @@ config.substitutions.append(('%{compile_flags}',
'-nostdinc++ -I %{include-dir} -I %{libcxx-dir}/test/support'
))
config.substitutions.append(('%{link_flags}',
'-nostdlib++ -L %{lib-dir} -lc++'
'-nostdlib++ -L %{lib-dir} -Wl,-rpath,%{lib-dir} -lc++'
))
config.substitutions.append(('%{exec}',
'%{executor} --execdir %T --env DYLD_LIBRARY_PATH=%{lib-dir} -- '
'%{executor} --execdir %T -- '
))

config.stdlib = 'apple-libc++'
Expand Down

0 comments on commit a4a0306

Please sign in to comment.