summaryrefslogtreecommitdiff
path: root/bin/bootstrap.py
diff options
context:
space:
mode:
authorOliver Reiche <oliver.reiche@huawei.com>2022-12-02 15:33:03 +0100
committerOliver Reiche <oliver.reiche@huawei.com>2022-12-09 13:13:21 +0100
commit7d260287328a38fbc1430bed56cbdaeaebd58efd (patch)
treec5a94ec2ad2585ce3f592797104af2a9e6e32f80 /bin/bootstrap.py
parent62d155accb047ade3d5a7a89b643e286b333ba41 (diff)
downloadjustbuild-7d260287328a38fbc1430bed56cbdaeaebd58efd.tar.gz
rules: Refactoring and minor improvements
Compared to the previous commit, the action graphs for just and its unit tests are unchanged. - Git hash of action graph for ["",""]: c6e75f17abd7ffaab6ff9bb725ad67ec0bf6c973 - Git hash of action graph for ["test/buildtool","TESTS"]: 8063dfb3dd7daa9ae01d95c177e14946f785c57e Refactor: - "local cflags" to "private-cflags" - "local defines" to "private-defines" - "link externals" to "private-ldflags" - "deps" to "private-deps" for (test) binaries - "proto" to "private-proto" for binaries Improvements: - consistent variable declaration order: OS, ARCH, HOST_ARCH, TARGET_ARCH, CC, CXX, CFLAGS, CXXFLAGS, ADD_CFLAGS, ADD_CXXFLAGS, AR, ENV, PATH - use fields close to their definition (in RULES) - use common expression for binaries and test binaries - split expression "flags" and "compiler" ... to separate ones for CC and CXX. - rename "transition" to "deps-transition" ... to avoid conflicts with other transitions. - support "defaults-transition" for CC expressions Implement: - "cflags" for libraries - "private-cflags" for (test) binaries - "private-defines" for test binaries - "private-ldflags" for test binaries - (public) "defines" for libraries
Diffstat (limited to 'bin/bootstrap.py')
-rwxr-xr-xbin/bootstrap.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/bootstrap.py b/bin/bootstrap.py
index f07b66af..a8030e12 100755
--- a/bin/bootstrap.py
+++ b/bin/bootstrap.py
@@ -231,7 +231,7 @@ def config_to_local(*, repos_file, link_targets_file):
link_external = ["-L%s" % (os.path.join(LOCALBASE, d),)
for d in global_link_dirs]
print("External link arguments %r" % (link_external,))
- main["link external"] = link_external
+ main["private-ldflags"] = link_external
target[LOCAL_LINK_DIRS_TARGET] = main
os.unlink(link_targets_file)
with open(link_targets_file, "w") as f: