[libcxx-commits] [PATCH] D108836: [libc++] Support -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=on in CI

[Fangrui Song via Phabricator via libcxx-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rGdaf0dfb786f0: [libc++] Support -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=on in CI (authored by MaskRay).

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D108836/new/

https://reviews.llvm.org/D108836

Files:
  libcxx/test/configs/libcxx-trunk-shared.cfg.in
  libcxx/test/configs/libcxx-trunk-static.cfg.in


Index: libcxx/test/configs/libcxx-trunk-static.cfg.in
===================================================================
--- libcxx/test/configs/libcxx-trunk-static.cfg.in
+++ libcxx/test/configs/libcxx-trunk-static.cfg.in
@@ -7,6 +7,9 @@
 COMPILER = "@CMAKE_CXX_COMPILER@"
 EXEC_ROOT = "@LIBCXX_BINARY_DIR@"
 CMAKE_OSX_SYSROOT = "@CMAKE_OSX_SYSROOT@"
+INCLUDE_DIR = "@LIBCXX_INSTALL_INCLUDE_DIR@"
+INCLUDE_TARGET_DIR = "@LIBCXX_INSTALL_INCLUDE_TARGET_DIR@"
+LIBRARY_DIR = "@LIBCXX_INSTALL_LIBRARY_DIR@"
 
 import os
 import pipes
@@ -32,13 +35,14 @@
     '-isysroot {}'.format(CMAKE_OSX_SYSROOT) if CMAKE_OSX_SYSROOT else ''
 ))
 config.substitutions.append(('%{compile_flags}',
-    '-nostdinc++ -isystem {} -I {}'.format(
-        os.path.join(INSTALL_ROOT, 'include', 'c++', 'v1'),
+    '-nostdinc++ -isystem {} -isystem {} -I {}'.format(
+        os.path.join(INSTALL_ROOT, INCLUDE_DIR),
+        os.path.join(INSTALL_ROOT, INCLUDE_TARGET_DIR),
         os.path.join(LIBCXX_ROOT, 'test', 'support'))
 ))
 config.substitutions.append(('%{link_flags}',
     '-nostdlib++ -L {} -lc++ -lc++abi -pthread'.format(
-        os.path.join(INSTALL_ROOT, 'lib'))
+        os.path.join(INSTALL_ROOT, LIBRARY_DIR))
 ))
 config.substitutions.append(('%{exec}',
     '{} {} --execdir %T -- '.format(
Index: libcxx/test/configs/libcxx-trunk-shared.cfg.in
===================================================================
--- libcxx/test/configs/libcxx-trunk-shared.cfg.in
+++ libcxx/test/configs/libcxx-trunk-shared.cfg.in
@@ -7,6 +7,9 @@
 COMPILER = "@CMAKE_CXX_COMPILER@"
 EXEC_ROOT = "@LIBCXX_BINARY_DIR@"
 CMAKE_OSX_SYSROOT = "@CMAKE_OSX_SYSROOT@"
+INCLUDE_DIR = "@LIBCXX_INSTALL_INCLUDE_DIR@"
+INCLUDE_TARGET_DIR = "@LIBCXX_INSTALL_INCLUDE_TARGET_DIR@"
+LIBRARY_DIR = "@LIBCXX_INSTALL_LIBRARY_DIR@"
 
 import os
 import pipes
@@ -32,13 +35,14 @@
     '-isysroot {}'.format(CMAKE_OSX_SYSROOT) if CMAKE_OSX_SYSROOT else ''
 ))
 config.substitutions.append(('%{compile_flags}',
-    '-nostdinc++ -isystem {} -I {}'.format(
-        os.path.join(INSTALL_ROOT, 'include', 'c++', 'v1'),
+    '-nostdinc++ -isystem {} -isystem {} -I {}'.format(
+        os.path.join(INSTALL_ROOT, INCLUDE_DIR),
+        os.path.join(INSTALL_ROOT, INCLUDE_TARGET_DIR),
         os.path.join(LIBCXX_ROOT, 'test', 'support'))
 ))
 config.substitutions.append(('%{link_flags}',
     '-nostdlib++ -L {0} -lc++ -Wl,-rpath,{0} -pthread'.format(
-        os.path.join(INSTALL_ROOT, 'lib'))
+        os.path.join(INSTALL_ROOT, LIBRARY_DIR))
 ))
 config.substitutions.append(('%{exec}',
     '{} {} --execdir %T -- '.format(


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D108836.369526.patch
Type: text/x-patch
Size: 2589 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20210830/f558a300/attachment.bin>