diff options
| author | Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com> | 2023-09-29 16:41:24 +0200 |
|---|---|---|
| committer | Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com> | 2023-11-02 12:06:50 +0100 |
| commit | 8d3d3a3dd8bda9f132dc3f15106c2f11bf22438b (patch) | |
| tree | 46c41c916253b0490c1856eec25d8998ce0af4a6 /bin/bootstrap.py | |
| parent | 3104edd7ff6e357afac09ce4c7c01dfab1de8e17 (diff) | |
| download | justbuild-8d3d3a3dd8bda9f132dc3f15106c2f11bf22438b.tar.gz | |
bootstrap: Add libarchive dependency
This is brought in by the tree-of-archive rpc of just serve.
Also adds lzma and bzip2 as transitive dependencies.
Diffstat (limited to 'bin/bootstrap.py')
| -rwxr-xr-x | bin/bootstrap.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/bin/bootstrap.py b/bin/bootstrap.py index 9f076c57..03fcbdd0 100755 --- a/bin/bootstrap.py +++ b/bin/bootstrap.py @@ -49,8 +49,10 @@ if 'JUST_BUILD_CONF' in os.environ: g_CONF = json.loads(os.environ['JUST_BUILD_CONF']) if "PACKAGE" in os.environ: - g_CONF["ADD_CFLAGS"] = ["-Wno-error", "-Wno-pedantic"] + g_CONF.get("ADD_CFLAGS", []) - g_CONF["ADD_CXXFLAGS"] = ["-Wno-error", "-Wno-pedantic"] + g_CONF.get("ADD_CXXFLAGS", []) + g_CONF["ADD_CFLAGS"] = ["-Wno-error", "-Wno-pedantic"] + g_CONF.get( + "ADD_CFLAGS", []) + g_CONF["ADD_CXXFLAGS"] = ["-Wno-error", "-Wno-pedantic"] + g_CONF.get( + "ADD_CXXFLAGS", []) ARCHS: Dict[str, str] = { 'i686': 'x86', @@ -405,6 +407,8 @@ def bootstrap() -> None: dirs.remove('serve_api') if 'other_tools' in dirs: dirs.remove('other_tools') + if 'archive' in dirs: + dirs.remove('archive') for f in files: if f.endswith(".cpp"): cpp_files.append(os.path.join(root, f)) |