From: Louis Dionne <ldionne@apple.com>
Date: Tue, 27 Oct 2020 19:57:47 +0000 (-0400)
Subject: [libc++] Make sure we include a header when checking compiler macros
X-Git-Tag: llvmorg-13-init~7965
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c56bbb3961e460cdff96c200068c073dd5d9f5cc;p=platform%2Fupstream%2Fllvm.git

[libc++] Make sure we include a header when checking compiler macros

Otherwise, it's possible for some __config_site macros not to be
picked up.
---

diff --git a/libcxx/utils/libcxx/test/dsl.py b/libcxx/utils/libcxx/test/dsl.py
index 938d371..6a02ae6 100644
--- a/libcxx/utils/libcxx/test/dsl.py
+++ b/libcxx/utils/libcxx/test/dsl.py
@@ -191,8 +191,12 @@ def compilerMacros(config, flags=''):
   be added to the compiler invocation when generating the macros.
   """
   with _makeConfigTest(config) as test:
+    with open(test.getSourcePath(), 'w') as sourceFile:
+      # Make sure files like <__config> are included, since they can define
+      # additional macros.
+      sourceFile.write("#include <cstddef>")
     unparsedOutput, err, exitCode, timeoutInfo = _executeScriptInternal(test, [
-      "%{{cxx}} -xc++ {} -dM -E %{{flags}} %{{compile_flags}} {}".format(os.devnull, flags)
+      "%{{cxx}} %s -dM -E %{{flags}} %{{compile_flags}} {}".format(flags)
     ])
     parsedMacros = dict()
     defines = (l.strip() for l in unparsedOutput.split('\n') if l.startswith('#define '))