From 0c9c29b6b64a05611dc66ec04747b3970e25ca5c Mon Sep 17 00:00:00 2001
From: Jussi Pakkanen <jpakkane@gmail.com>
Date: Sun, 20 Mar 2016 19:00:57 +0200
Subject: [PATCH] Preserve b_ prefix for base option names.

---
 mesonbuild/compilers.py      | 2 +-
 mesonbuild/optinterpreter.py | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/mesonbuild/compilers.py b/mesonbuild/compilers.py
index 2c35c67a8..2a9c3abf6 100644
--- a/mesonbuild/compilers.py
+++ b/mesonbuild/compilers.py
@@ -121,7 +121,7 @@ base_options = {'b_lto': coredata.UserBooleanOption('b_lto', 'Use link time opti
                 'b_lundef': coredata.UserBooleanOption('b_lundef', 'Use -Wl,--no-undefined when linking', True),
                 'b_pgo': coredata.UserComboOption('b_pgo', 'Use profile guide optimization',
                                                   ['off', 'generate', 'use'],
-                                                  'off')
+                                                  'off'),
                 }
 
 def sanitizer_compile_args(value):
diff --git a/mesonbuild/optinterpreter.py b/mesonbuild/optinterpreter.py
index f0c93ae01..95d047259 100644
--- a/mesonbuild/optinterpreter.py
+++ b/mesonbuild/optinterpreter.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from . import mparser
-from . import coredata, mesonlib
+from . import coredata
 import os, re
 
 forbidden_option_names = coredata.builtin_options
@@ -24,13 +24,16 @@ forbidden_prefixes = {'c_': True,
                       'objc_': True,
                       'objcpp_': True,
                       'vala_': True,
-                      'csharp_': True
+                      'csharp_': True,
+                      'swift_': True,
+                      'b_': True,
                       }
 
 def is_invalid_name(name):
     if name in forbidden_option_names:
         return True
-    if name in forbidden_prefixes:
+    pref = name.split('_')[0] + '_'
+    if pref in forbidden_prefixes:
         return True
     return False