Merge pull request #35 from tbs60/dev_michealhe

linux C++ 编译默认接管 ld、lld #34
TencentBlueKing · Mar 13, 2023 · 5572237 · 5572237
2 parents 42d2651 + d163583
commit 5572237
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/src/backend/booster/bk_dist/install/template/bk_cc_and_cache_rules.json b/src/backend/booster/bk_dist/install/template/bk_cc_and_cache_rules.json
@@ -6,11 +6,15 @@
 		{"src_command":"*/clang","target_command":"$CCACHEPATH $EXECUTORPATH $SRC_CMD"},
 		{"src_command":"*/cc","target_command":"$CCACHEPATH $EXECUTORPATH $SRC_CMD"},
 		{"src_command":"*/c++","target_command":"$CCACHEPATH $EXECUTORPATH $SRC_CMD"},
+		{"src_command":"*/ld","target_command":"$CCACHEPATH $EXECUTORPATH $SRC_CMD"},
+		{"src_command":"*/lld","target_command":"$CCACHEPATH $EXECUTORPATH $SRC_CMD"},
 		{"src_command":"g++","target_command":"$CCACHEPATH $EXECUTORPATH $SRC_CMD"},
 		{"src_command":"gcc","target_command":"$CCACHEPATH $EXECUTORPATH $SRC_CMD"},
 		{"src_command":"clang++","target_command":"$CCACHEPATH $EXECUTORPATH $SRC_CMD"},
 		{"src_command":"clang","target_command":"$CCACHEPATH $EXECUTORPATH $SRC_CMD"},
 		{"src_command":"cc","target_command":"$CCACHEPATH $EXECUTORPATH $SRC_CMD"},
-		{"src_command":"c++","target_command":"$CCACHEPATH $EXECUTORPATH $SRC_CMD"}
+		{"src_command":"c++","target_command":"$CCACHEPATH $EXECUTORPATH $SRC_CMD"},
+		{"src_command":"ld","target_command":"$CCACHEPATH $EXECUTORPATH $SRC_CMD"},
+		{"src_command":"lld","target_command":"$CCACHEPATH $EXECUTORPATH $SRC_CMD"}
 	]
 }
diff --git a/src/backend/booster/bk_dist/install/template/bk_cc_launcher_rules.json b/src/backend/booster/bk_dist/install/template/bk_cc_launcher_rules.json
@@ -6,11 +6,15 @@
 		{"src_command":"*/clang","target_command":"$LAUNCHER_HOOK $SRC_CMD"},
 		{"src_command":"*/cc","target_command":"$LAUNCHER_HOOK $SRC_CMD"},
 		{"src_command":"*/c++","target_command":"$LAUNCHER_HOOK $SRC_CMD"},
+		{"src_command":"*/ld","target_command":"$LAUNCHER_HOOK $SRC_CMD"},
+		{"src_command":"*/lld","target_command":"$LAUNCHER_HOOK $SRC_CMD"},
 		{"src_command":"clang","target_command":"$LAUNCHER_HOOK $SRC_CMD"},
 		{"src_command":"g++","target_command":"$LAUNCHER_HOOK $SRC_CMD"},
 		{"src_command":"gcc","target_command":"$LAUNCHER_HOOK $SRC_CMD"},
 		{"src_command":"clang++","target_command":"$LAUNCHER_HOOK $SRC_CMD"},
 		{"src_command":"cc","target_command":"$LAUNCHER_HOOK $SRC_CMD"},
-		{"src_command":"c++","target_command":"$LAUNCHER_HOOK $SRC_CMD"}
+		{"src_command":"c++","target_command":"$LAUNCHER_HOOK $SRC_CMD"},
+		{"src_command":"ld","target_command":"$LAUNCHER_HOOK $SRC_CMD"},
+		{"src_command":"lld","target_command":"$LAUNCHER_HOOK $SRC_CMD"}
 	]
 }
diff --git a/src/backend/booster/bk_dist/install/template/bk_cc_only_cache_rules.json b/src/backend/booster/bk_dist/install/template/bk_cc_only_cache_rules.json
@@ -6,11 +6,15 @@
 		{"src_command":"*/clang","target_command":"$CCACHEPATH $SRC_CMD"},
 		{"src_command":"*/cc","target_command":"$CCACHEPATH $SRC_CMD"},
 		{"src_command":"*/c++","target_command":"$CCACHEPATH $SRC_CMD"},
+		{"src_command":"*/ld","target_command":"$CCACHEPATH $SRC_CMD"},
+		{"src_command":"*/lld","target_command":"$CCACHEPATH $SRC_CMD"},
 		{"src_command":"g++","target_command":"$CCACHEPATH $SRC_CMD"},
 		{"src_command":"gcc","target_command":"$CCACHEPATH $SRC_CMD"},
 		{"src_command":"clang++","target_command":"$CCACHEPATH $SRC_CMD"},
 		{"src_command":"clang","target_command":"$CCACHEPATH $SRC_CMD"},
 		{"src_command":"cc","target_command":"$CCACHEPATH $SRC_CMD"},
-		{"src_command":"c++","target_command":"$CCACHEPATH $SRC_CMD"}
+		{"src_command":"c++","target_command":"$CCACHEPATH $SRC_CMD"},
+		{"src_command":"ld","target_command":"$CCACHEPATH $SRC_CMD"},
+		{"src_command":"lld","target_command":"$CCACHEPATH $SRC_CMD"}
 	]
 }
diff --git a/src/backend/booster/bk_dist/install/template/bk_cc_rules.json b/src/backend/booster/bk_dist/install/template/bk_cc_rules.json
@@ -6,11 +6,15 @@
 		{"src_command":"*/clang","target_command":"$EXECUTORPATH $SRC_CMD"},
 		{"src_command":"*/cc","target_command":"$EXECUTORPATH $SRC_CMD"},
 		{"src_command":"*/c++","target_command":"$EXECUTORPATH $SRC_CMD"},
+		{"src_command":"*/ld","target_command":"$EXECUTORPATH $SRC_CMD"},
+		{"src_command":"*/lld","target_command":"$EXECUTORPATH $SRC_CMD"},
 		{"src_command":"clang","target_command":"$EXECUTORPATH $SRC_CMD"},
 		{"src_command":"g++","target_command":"$EXECUTORPATH $SRC_CMD"},
 		{"src_command":"gcc","target_command":"$EXECUTORPATH $SRC_CMD"},
 		{"src_command":"clang++","target_command":"$EXECUTORPATH $SRC_CMD"},
 		{"src_command":"cc","target_command":"$EXECUTORPATH $SRC_CMD"},
-		{"src_command":"c++","target_command":"$EXECUTORPATH $SRC_CMD"}
+		{"src_command":"c++","target_command":"$EXECUTORPATH $SRC_CMD"},
+		{"src_command":"ld","target_command":"$EXECUTORPATH $SRC_CMD"},
+		{"src_command":"lld","target_command":"$EXECUTORPATH $SRC_CMD"}
 	]
 }