X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/ad60e80f3d13e8c4306a22a9d15863f73c576a27..70946cff5eaf230a65ad8581773a535e293f0c85:/tests/headers.at

diff --git a/tests/headers.at b/tests/headers.at
index 07f1d1bc..421dd7d8 100644
--- a/tests/headers.at
+++ b/tests/headers.at
@@ -169,8 +169,9 @@ AT_SKEL_CC_IF([],
 # YYPUSH_MORE(_DEFINED)? (whose definition is constant).
 #
 # YYDEBUG (not renamed) can be read, but not changed.
-AT_CHECK([[sed -ne 's,/\*[^*]*\*/,,g;s,//.*,,' \
-                -e '/YY/p' ]$1.AT_SKEL_CC_IF([hh], [h])[ |
+AT_CHECK([[$PERL -0777 -e 's{/\*.*?\*/}{}sg;s,//.*,,;' \
+            ]$1.AT_SKEL_CC_IF([hh], [h])[ |
+         grep 'YY' |
      $EGREP -wv 'YY(PARSE_PARAM|PUSH_MORE(_DEFINED)?)|(defined|if) YYDEBUG']],
          [1])
 AT_LANG_COMPILE([$1.o])
@@ -182,8 +183,12 @@ AT_BISON_OPTION_POPDEFS
 
 AT_DATA([main.cc],
 [AT_DATA_SOURCE_PROLOGUE
-[extern "C"
+[// If we are compiling with CC=$CXX, then do not load the C headers
+// inside extern "C", since they were _not_ compiled this way.
+#if ! CC_IS_CXX
+extern "C"
 {
+#endif
   #include "x1.h"
   #include "x2.h"
   #include "x3.h"
@@ -191,7 +196,9 @@ AT_DATA([main.cc],
   #include "x6.h"
   #include "x7.h"
   #include "x8.h"
+#if ! CC_IS_CXX
 }
+#endif
 #include "x5.hh"
 //#include "x6.hh"
 
@@ -230,7 +237,7 @@ AT_TEST([x7], [%define api.push-pull both])
 AT_TEST([x8], [%define api.pure %define api.push-pull both])
 #AT_TEST([x5], [%locations %language "c++" %glr-parser])
 
-AT_COMPILE_CXX([parser], [[x[1-8].o main.cc]])
+AT_COMPILE_CXX([parser], [[x[1-8].o -DCC_IS_CXX=$CC_IS_CXX main.cc]])
 AT_CHECK([./parser], [0], [[expout]])
 
 m4_popdef([AT_TEST])