[libcxx-commits] [PATCH] D112460: [libc++] Include nasty_macros.h when running tests with from-scratch configs

[Louis Dionne via Phabricator via libcxx-commits]

ldionne created this revision.
ldionne requested review of this revision.
Herald added a project: libc++.
Herald added a subscriber: libcxx-commits.
Herald added a reviewer: libc++.

This was forgotten when setting up the from-scratch configs.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D112460

Files:
  libcxx/test/configs/apple-libc++-shared.cfg.in
  libcxx/test/configs/ibm-libc++-shared.cfg.in
  libcxx/test/configs/llvm-libc++-shared-gcc.cfg.in
  libcxx/test/configs/llvm-libc++-shared.cfg.in
  libcxx/test/configs/llvm-libc++-static.cfg.in


Index: libcxx/test/configs/llvm-libc++-static.cfg.in
===================================================================
--- libcxx/test/configs/llvm-libc++-static.cfg.in
+++ libcxx/test/configs/llvm-libc++-static.cfg.in
@@ -9,7 +9,7 @@
     '-isysroot {}'.format('@CMAKE_OSX_SYSROOT@') if '@CMAKE_OSX_SYSROOT@' else ''
 ))
 config.substitutions.append(('%{compile_flags}',
-    '-nostdinc++ -isystem %{include} -isystem %{target-include} -I %{libcxx}/test/support'
+    '-nostdinc++ -isystem %{include} -isystem %{target-include} -I %{libcxx}/test/support -include %{libcxx}/test/support/nasty_macros.h'
 ))
 config.substitutions.append(('%{link_flags}',
     '-nostdlib++ -L %{lib} -lc++ -lc++abi -pthread'
Index: libcxx/test/configs/llvm-libc++-shared.cfg.in
===================================================================
--- libcxx/test/configs/llvm-libc++-shared.cfg.in
+++ libcxx/test/configs/llvm-libc++-shared.cfg.in
@@ -9,7 +9,7 @@
     '-isysroot {}'.format('@CMAKE_OSX_SYSROOT@') if '@CMAKE_OSX_SYSROOT@' else ''
 ))
 config.substitutions.append(('%{compile_flags}',
-    '-nostdinc++ -isystem %{include} -isystem %{target-include} -I %{libcxx}/test/support'
+    '-nostdinc++ -isystem %{include} -isystem %{target-include} -I %{libcxx}/test/support -include %{libcxx}/test/support/nasty_macros.h'
 ))
 config.substitutions.append(('%{link_flags}',
     '-nostdlib++ -L %{lib} -Wl,-rpath,%{lib} -lc++ -pthread'
Index: libcxx/test/configs/llvm-libc++-shared-gcc.cfg.in
===================================================================
--- libcxx/test/configs/llvm-libc++-shared-gcc.cfg.in
+++ libcxx/test/configs/llvm-libc++-shared-gcc.cfg.in
@@ -8,7 +8,7 @@
 
 config.substitutions.append(('%{flags}', ''))
 config.substitutions.append(('%{compile_flags}',
-    '-nostdinc++ -isystem %{include} -isystem %{target-include} -I %{libcxx}/test/support'
+    '-nostdinc++ -isystem %{include} -isystem %{target-include} -I %{libcxx}/test/support -include %{libcxx}/test/support/nasty_macros.h'
 ))
 config.substitutions.append(('%{link_flags}',
     '-L %{lib} -Wl,-rpath,%{lib} -nodefaultlibs -lc++ -lm -lgcc_s -lgcc -lpthread -lc -lgcc_s -lgcc -latomic'
Index: libcxx/test/configs/ibm-libc++-shared.cfg.in
===================================================================
--- libcxx/test/configs/ibm-libc++-shared.cfg.in
+++ libcxx/test/configs/ibm-libc++-shared.cfg.in
@@ -8,7 +8,7 @@
 
 config.substitutions.append(('%{flags}', ''))
 config.substitutions.append(('%{compile_flags}',
-    '-nostdinc++ -D__LIBC_NO_CPP_MATH_OVERLOADS__ -isystem %{install}/include/c++/v1 -I %{libcxx}/test/support'
+    '-nostdinc++ -D__LIBC_NO_CPP_MATH_OVERLOADS__ -isystem %{install}/include/c++/v1 -I %{libcxx}/test/support -include %{libcxx}/test/support/nasty_macros.h'
 ))
 config.substitutions.append(('%{link_flags}',
     '-nostdlib++ -L %{install}/lib -lc++ -lc++abi -latomic -Wl,-bbigtoc'
Index: libcxx/test/configs/apple-libc++-shared.cfg.in
===================================================================
--- libcxx/test/configs/apple-libc++-shared.cfg.in
+++ libcxx/test/configs/apple-libc++-shared.cfg.in
@@ -15,7 +15,7 @@
     '-isysroot {}'.format('@CMAKE_OSX_SYSROOT@') if '@CMAKE_OSX_SYSROOT@' else ''
 ))
 config.substitutions.append(('%{compile_flags}',
-    '-nostdinc++ -isystem %{install}/include/c++/v1 -I %{libcxx}/test/support'
+    '-nostdinc++ -isystem %{install}/include/c++/v1 -I %{libcxx}/test/support -include %{libcxx}/test/support/nasty_macros.h'
 ))
 config.substitutions.append(('%{link_flags}',
     '-nostdlib++ -L %{install}/lib -lc++'


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D112460.382003.patch
Type: text/x-patch
Size: 3579 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20211025/b0a34721/attachment.bin>