diff options
| author | Oliver Reiche <oliver.reiche@huawei.com> | 2023-07-06 14:21:27 +0200 |
|---|---|---|
| committer | Oliver Reiche <oliver.reiche@huawei.com> | 2023-08-16 15:32:11 +0200 |
| commit | ffbb5ab230d1307e10f72bf5d94441b2a134c5af (patch) | |
| tree | f4e37ba002208001188add56e12c57fb6054a896 /bin | |
| parent | e17365cb6d1af6ae12fdaaf97f28a02c7ee61bed (diff) | |
| download | justbuild-ffbb5ab230d1307e10f72bf5d94441b2a134c5af.tar.gz | |
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"].
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/bootstrap.py | 6 |
1 files changed, 3 insertions, 3 deletions
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++" |