================
@@ -172,6 +172,20 @@ def push_dynamic_library_lookup_path(config, new_path):
# doesn't match config.compiler_rt_libdir then it means we might be testing the
# compiler's own runtime libraries rather than the ones we just built.
# Warn about about this and handle appropriately.
+if config.test_standalone_build_libs:
+ if config.compiler_id == "Clang":
+ # Ensure that we use the just-built libraries when linking by
overriding
+ # the Clang resource directory. However, this also means that we can no
+ # longer find the builtin headers from that path, so we explicitly add
+ # the builtin headers as an include path.
+ resource_dir, _ = get_path_from_clang(
+ shlex.split(config.target_cflags) + ["-print-resource-dir"],
allow_failure=False
+ )
+ config.target_cflags += f" -nobuiltininc"
+ config.target_cflags += f" -I{config.compiler_rt_src_root}/include"
+ config.target_cflags += f" -idirafter {resource_dir}/include"
+ config.target_cflags += f" -resource-dir={config.compiler_rt_obj_root}"
+ config.target_cflags += f" -Wl,--rpath={config.compiler_rt_libdir}"
----------------
delcypher wrote:
@arichardson To be clear. I'm not necessarily against your change but I'm a bit
concerned about your change being on the default path given that it's not
normally necessary.
https://github.com/llvm/llvm-project/pull/83088
_______________________________________________
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
