summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmar Takhar <amar@rtems.org>2015-02-09 09:47:49 -0500
committerAmar Takhar <amar@rtems.org>2015-12-11 15:14:56 -0500
commit26dad22422c0fcaddd22512767741d7497a24119 (patch)
tree920251ba0ecbfd2886a452209eb02bb92c9056d8
parent614f52fc60685cdee00a7a8ecdcd5be067b839ee (diff)
Fix 'waf config' with new config file loader.
-rw-r--r--rtems_waf/config/base.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/rtems_waf/config/base.py b/rtems_waf/config/base.py
index c4ff636815..21126fe09b 100644
--- a/rtems_waf/config/base.py
+++ b/rtems_waf/config/base.py
@@ -245,7 +245,8 @@ class BuildConfig(object):
self._parse_bsp(self.list_bsp)
# Load user configuration
- self._cfg_user_load()
+ if not list_bsp:
+ self._cfg_user_load()
# Make sure BSP= is always set.
self.option_set("general", "BSP", " " .join(self.list_bsp))