summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2019-05-07 09:13:12 +1000
committerChris Johns <chrisj@rtems.org>2019-05-07 09:13:12 +1000
commit0956a2c089faf2600047577bb153afcaaba22288 (patch)
tree16a9ab7ac2846268625a0e3fdec6b9642241fdaf
parent6: Update unstable RTEMS 6 tool chain (diff)
downloadrtems-source-builder-0956a2c089faf2600047577bb153afcaaba22288.tar.bz2
sb/config: Fix os and arch conditional logic.
Correctly split the argument list and check each element. Closes #3743
-rw-r--r--source-builder/sb/config.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/source-builder/sb/config.py b/source-builder/sb/config.py
index b7bf403..df81d42 100644
--- a/source-builder/sb/config.py
+++ b/source-builder/sb/config.py
@@ -959,7 +959,8 @@ class file:
isos = False
if isvalid:
os = self.define('_os')
- for l in ls:
+ ls = ' '.join(ls).split()
+ for l in ls[1:]:
if l in os:
isos = True
break
@@ -969,7 +970,8 @@ class file:
isnos = True
if isvalid:
os = self.define('_os')
- for l in ls:
+ ls = ' '.join(ls).split()
+ for l in ls[1:]:
if l in os:
isnos = False
break
@@ -979,7 +981,8 @@ class file:
isarch = False
if isvalid:
arch = self.define('_arch')
- for l in ls:
+ ls = ' '.join(ls).split()
+ for l in ls[1:]:
if l in arch:
isarch = True
break