[llvm] 9118d3a - gn build: Fix port of 3cb28522ba4c

[Peter Collingbourne via llvm-commits]

Author: Peter Collingbourne
Date: 2024-11-26T13:17:23-08:00
New Revision: 9118d3a564f271006b0d8aed0983f7ba025e77a0

URL: https://github.com/llvm/llvm-project/commit/9118d3a564f271006b0d8aed0983f7ba025e77a0
DIFF: https://github.com/llvm/llvm-project/commit/9118d3a564f271006b0d8aed0983f7ba025e77a0.diff

LOG: gn build: Fix port of 3cb28522ba4c

COMPILER_RT_EXEC_OUTPUT_DIR is expected to be the path where
hwasan_symbolize is installed, i.e. the bin subdirectory of the
build directory, but we were incorrectly setting it to the install
location of the runtime libraries. Fix it.

Added: 
    

Modified: 
    llvm/utils/gn/secondary/compiler-rt/test/BUILD.gn

Removed: 
    


################################################################################
diff  --git a/llvm/utils/gn/secondary/compiler-rt/test/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/test/BUILD.gn
index 7194c47b1becc4..020f3e7d9acd7b 100644
--- a/llvm/utils/gn/secondary/compiler-rt/test/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/test/BUILD.gn
@@ -55,7 +55,8 @@ write_cmake_config("lit_common_configured") {
     "COMPILER_RT_ENABLE_INTERNAL_SYMBOLIZER_PYBOOL=False",
     "COMPILER_RT_HAS_NO_DEFAULT_CONFIG_FLAG_PYBOOL=True",
     "COMPILER_RT_INTERCEPT_LIBDISPATCH_PYBOOL=False",
-    "COMPILER_RT_RESOLVED_EXEC_OUTPUT_DIR=" + rebase_path(crt_current_out_dir),
+    "COMPILER_RT_RESOLVED_EXEC_OUTPUT_DIR=" +
+        rebase_path("$root_build_dir/bin"),
     "COMPILER_RT_RESOLVED_LIBRARY_OUTPUT_DIR=" +
         rebase_path(crt_current_out_dir),
     "COMPILER_RT_RESOLVED_OUTPUT_DIR=" + rebase_path(crt_current_out_dir),