diff options
| author | Iain Sandoe <iain@sandoe.co.uk> | 2021-03-30 14:56:39 +0100 |
|---|---|---|
| committer | Iain Sandoe <iain@sandoe.co.uk> | 2021-04-01 19:32:16 +0100 |
| commit | af78514a18ca5c9aaa10813bb4dc639d7ccdf0cc (patch) | |
| tree | 7bd4a70961432d96ca9aa4661fb70209d26f0229 /c++tools | |
| parent | 5f00df5925082c7b66da91270f2ed29bf4818c93 (diff) | |
| download | gcc-af78514a18ca5c9aaa10813bb4dc639d7ccdf0cc.tar.gz | |
modules : Make sure we include <map> in system.h.
It appears that many targets include the map header transitively in
other std headers included from system.h. However there are some
editions of clang/libc++ in Xcode that do not, which results in a
bootstrap fail - since when resolver.h is included there is then a
conflict in declaring abort().
The fix is to ensure that map is pulled in by system.h and before
resolver.h is included. As a precautionary measure and to alert
anyone perhaps adding another header to resolver.h this patch also
gates the direct includes there on !IN_GCC.
c++tools/ChangeLog:
* resolver.h: Do not include std headers directly when
building in GCC.
gcc/cp/ChangeLog:
* mapper-client.cc (INCLUDE_MAP): New; require map to be
included from system.h.
* mapper-resolver.cc (INCLUDE_MAP): Likewise.
Diffstat (limited to 'c++tools')
| -rw-r--r-- | c++tools/resolver.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/c++tools/resolver.h b/c++tools/resolver.h index 19339125b26..a9547bf6994 100644 --- a/c++tools/resolver.h +++ b/c++tools/resolver.h @@ -24,8 +24,10 @@ along with GCC; see the file COPYING3. If not see // Mapper interface for client and server bits #include "cody.hh" // C++ +#if !IN_GCC #include <string> #include <map> +#endif // This is a GCC class, so GCC coding conventions on new bits. class module_resolver : public Cody::Resolver |