diff options
author | Oliver Reiche <oliver.reiche@huawei.com> | 2024-02-14 15:54:30 +0100 |
---|---|---|
committer | Oliver Reiche <oliver.reiche@huawei.com> | 2024-02-15 13:11:36 +0100 |
commit | 0c205e0fa81181241154a3148f6ccfbe2fd5bb29 (patch) | |
tree | 9fa875ed3efc93a05acef135c4cae5be14722a0a /src | |
parent | 09f90fac9092de13a71723f849794474831fd678 (diff) | |
download | justbuild-0c205e0fa81181241154a3148f6ccfbe2fd5bb29.tar.gz |
defaults: Support fully static linking
... of all produced binaries, including the intermediate
ones: protoc and grpc_cpp_plugin.
Diffstat (limited to 'src')
-rw-r--r-- | src/buildtool/main/TARGETS | 6 | ||||
-rw-r--r-- | src/other_tools/just_mr/TARGETS | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/src/buildtool/main/TARGETS b/src/buildtool/main/TARGETS index b44f4ebc..944f94dc 100644 --- a/src/buildtool/main/TARGETS +++ b/src/buildtool/main/TARGETS @@ -1,6 +1,6 @@ { "just": { "type": ["@", "rules", "CC", "binary"] - , "arguments_config": ["BUILD_STATIC_BINARY", "FINAL_LDFLAGS"] + , "arguments_config": ["FINAL_LDFLAGS"] , "name": ["just"] , "srcs": ["main.cpp"] , "private-deps": @@ -42,10 +42,6 @@ { "type": "++" , "$1": [ ["-Wl,-z,stack-size=8388608"] - , { "type": "if" - , "cond": {"type": "var", "name": "BUILD_STATIC_BINARY"} - , "then": ["-static"] - } , {"type": "var", "name": "FINAL_LDFLAGS", "default": []} ] } diff --git a/src/other_tools/just_mr/TARGETS b/src/other_tools/just_mr/TARGETS index 359b1443..4b9cf071 100644 --- a/src/other_tools/just_mr/TARGETS +++ b/src/other_tools/just_mr/TARGETS @@ -1,6 +1,6 @@ { "just-mr": { "type": ["@", "rules", "CC", "binary"] - , "arguments_config": ["BUILD_STATIC_BINARY", "FINAL_LDFLAGS"] + , "arguments_config": ["FINAL_LDFLAGS"] , "name": ["just-mr"] , "srcs": ["main.cpp"] , "private-deps": @@ -28,10 +28,6 @@ { "type": "++" , "$1": [ ["-Wl,-z,stack-size=8388608"] - , { "type": "if" - , "cond": {"type": "var", "name": "BUILD_STATIC_BINARY"} - , "then": ["-static"] - } , {"type": "var", "name": "FINAL_LDFLAGS", "default": []} ] } |