From 3c9f227c44f4688250df9399ea3d2f89ee7d53b6 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Thu, 4 Mar 2021 17:27:49 +0300
Subject: Enable regex linkage failure workaround for all libcpp versions

---
 libbuild2/script/regex.hxx | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'libbuild2')

diff --git a/libbuild2/script/regex.hxx b/libbuild2/script/regex.hxx
index 566ff92..e043c99 100644
--- a/libbuild2/script/regex.hxx
+++ b/libbuild2/script/regex.hxx
@@ -25,10 +25,10 @@ namespace build2
       enum class char_flags: uint16_t
       {
         icase = 0x1, // Case-insensitive match.
-          idot  = 0x2, // Invert '.' escaping.
+        idot  = 0x2, // Invert '.' escaping.
 
-          none = 0
-          };
+        none = 0
+      };
 
       // Restricts valid standard flags to just {icase}, extends with custom
       // flags {idot}.
@@ -66,9 +66,9 @@ namespace build2
       enum class line_type
       {
         special,
-          literal,
-          regex
-          };
+        literal,
+        regex
+      };
 
       struct line_char
       {
@@ -625,7 +625,8 @@ namespace std
   // specialize the class template to behave as the __match_any<line_char>
   // instantiation does (that luckily has all the functions in place).
   //
-#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION <= 11000
+//#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION <= 11000
+#ifdef _LIBCPP_VERSION
   template <>
   class __match_any_but_newline<build2::script::regex::line_char>
     : public __match_any<build2::script::regex::line_char>
-- 
cgit v1.1