From ffbb5ab230d1307e10f72bf5d94441b2a134c5af Mon Sep 17 00:00:00 2001 From: Oliver Reiche Date: Thu, 6 Jul 2023 14:21:27 +0200 Subject: Introduce configuration variable TOOLCHAIN_CONFIG ... to pass along toolchain settings for current and future toolchain definitions. Configuration variable COMPILER_FAMILY is replaced by TOOLCHAIN_CONFIG["FAMILY"]. --- bin/bootstrap.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'bin/bootstrap.py') diff --git a/bin/bootstrap.py b/bin/bootstrap.py index 17c60e48..654f931f 100755 --- a/bin/bootstrap.py +++ b/bin/bootstrap.py @@ -91,11 +91,11 @@ CFLAGS = [] CXXFLAGS = [] FINAL_LDFLAGS = ["-Wl,-z,stack-size=8388608"] -if "COMPILER_FAMILY" in CONF: - if CONF["COMPILER_FAMILY"] == "gnu": +if "TOOLCHAIN_CONFIG" in CONF and "FAMILY" in CONF["TOOLCHAIN_CONFIG"]: + if CONF["TOOLCHAIN_CONFIG"]["FAMILY"] == "gnu": CC="gcc" CXX="g++" - elif CONF["COMPILER_FAMILY"] == "clang": + elif CONF["TOOLCHAIN_CONFIG"]["FAMILY"] == "clang": CC="clang" CXX="clang++" -- cgit v1.2.3