From 99e984424520545bfab9632115b727deeea11812 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 30 Nov 2020 09:12:27 +0200 Subject: Disable __import recognition since GCC now uses [[__translated]] --- libbuild2/cc/parser+module.test.testscript | 2 +- libbuild2/cc/parser.cxx | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libbuild2/cc/parser+module.test.testscript b/libbuild2/cc/parser+module.test.testscript index 1f21ef4..91cbe45 100644 --- a/libbuild2/cc/parser+module.test.testscript +++ b/libbuild2/cc/parser+module.test.testscript @@ -44,7 +44,7 @@ EOI $* <; -__import "/usr/include/stdio.h"; +import "/usr/include/stdio.h" [[__translated]]; EOI : import-part diff --git a/libbuild2/cc/parser.cxx b/libbuild2/cc/parser.cxx index 5e6f43a..9559b87 100644 --- a/libbuild2/cc/parser.cxx +++ b/libbuild2/cc/parser.cxx @@ -79,8 +79,10 @@ namespace build2 // for details. // // Additionally, when include is translated to an import, it's - // normally replaced with the special __import keyword since it - // may appear in C context. + // normally replaced with special import (special since it may + // appear in C context); it could be a special keyword (GCC used + // to call it __import) or it can have a special attribute (GCC + // currently marks it with [[__translated]]). // if (bb == 0 && t.first) { @@ -113,7 +115,7 @@ namespace build2 else n = false; } - else if (id == "import" || id == "__import") + else if (id == "import" /*|| id == "__import"*/) { l_->next (t); -- cgit v1.1