gn recipe: Do not pass libraries in LDFLAGS in the Linux recipe
The existing recipe was added before the GN build switched to libc++ and
//build/gen.py started setting flags such as -static-libstdc++ -ldl
-lpthread on its own.
The recipe's settings are now redundant and actually hide bugs from the
bots. For example, commit 082fbe397d ("Pass -lpthread when linking instead
of -pthread") should have broken the bot, but since it is explicitly passing
-lpthread in LDFLAGS the build continued working.
Bug: chromium:934793
Change-Id: I634a1b6206b5af2e9df53005ccbe8547f56eb0c7
Reviewed-on: https://gn-review.googlesource.com/c/4080
Reviewed-by: Petr Hosek <phosek@google.com>
Commit-Queue: Petr Hosek <phosek@google.com>
diff --git a/infra/recipes/gn.expected/ci_linux.json b/infra/recipes/gn.expected/ci_linux.json
index 0179799..993c491 100644
--- a/infra/recipes/gn.expected/ci_linux.json
+++ b/infra/recipes/gn.expected/ci_linux.json
@@ -104,7 +104,7 @@
"CC": "[START_DIR]/cipd/bin/clang",
"CFLAGS": "--sysroot=[START_DIR]/cipd/sysroot",
"CXX": "[START_DIR]/cipd/bin/clang++",
- "LDFLAGS": "--sysroot=[START_DIR]/cipd/sysroot -static-libstdc++ -ldl -lpthread"
+ "LDFLAGS": "--sysroot=[START_DIR]/cipd/sysroot"
},
"name": "debug.build.generate",
"~followup_annotations": [
@@ -123,7 +123,7 @@
"CC": "[START_DIR]/cipd/bin/clang",
"CFLAGS": "--sysroot=[START_DIR]/cipd/sysroot",
"CXX": "[START_DIR]/cipd/bin/clang++",
- "LDFLAGS": "--sysroot=[START_DIR]/cipd/sysroot -static-libstdc++ -ldl -lpthread"
+ "LDFLAGS": "--sysroot=[START_DIR]/cipd/sysroot"
},
"name": "debug.build.ninja",
"~followup_annotations": [
@@ -164,7 +164,7 @@
"CC": "[START_DIR]/cipd/bin/clang",
"CFLAGS": "--sysroot=[START_DIR]/cipd/sysroot",
"CXX": "[START_DIR]/cipd/bin/clang++",
- "LDFLAGS": "--sysroot=[START_DIR]/cipd/sysroot -static-libstdc++ -ldl -lpthread"
+ "LDFLAGS": "--sysroot=[START_DIR]/cipd/sysroot"
},
"name": "release.build.generate",
"~followup_annotations": [
@@ -183,7 +183,7 @@
"CC": "[START_DIR]/cipd/bin/clang",
"CFLAGS": "--sysroot=[START_DIR]/cipd/sysroot",
"CXX": "[START_DIR]/cipd/bin/clang++",
- "LDFLAGS": "--sysroot=[START_DIR]/cipd/sysroot -static-libstdc++ -ldl -lpthread"
+ "LDFLAGS": "--sysroot=[START_DIR]/cipd/sysroot"
},
"name": "release.build.ninja",
"~followup_annotations": [
diff --git a/infra/recipes/gn.expected/cipd_exists.json b/infra/recipes/gn.expected/cipd_exists.json
index a1b32ae..c6f3825 100644
--- a/infra/recipes/gn.expected/cipd_exists.json
+++ b/infra/recipes/gn.expected/cipd_exists.json
@@ -104,7 +104,7 @@
"CC": "[START_DIR]/cipd/bin/clang",
"CFLAGS": "--sysroot=[START_DIR]/cipd/sysroot",
"CXX": "[START_DIR]/cipd/bin/clang++",
- "LDFLAGS": "--sysroot=[START_DIR]/cipd/sysroot -static-libstdc++ -ldl -lpthread"
+ "LDFLAGS": "--sysroot=[START_DIR]/cipd/sysroot"
},
"name": "debug.build.generate",
"~followup_annotations": [
@@ -123,7 +123,7 @@
"CC": "[START_DIR]/cipd/bin/clang",
"CFLAGS": "--sysroot=[START_DIR]/cipd/sysroot",
"CXX": "[START_DIR]/cipd/bin/clang++",
- "LDFLAGS": "--sysroot=[START_DIR]/cipd/sysroot -static-libstdc++ -ldl -lpthread"
+ "LDFLAGS": "--sysroot=[START_DIR]/cipd/sysroot"
},
"name": "debug.build.ninja",
"~followup_annotations": [
@@ -164,7 +164,7 @@
"CC": "[START_DIR]/cipd/bin/clang",
"CFLAGS": "--sysroot=[START_DIR]/cipd/sysroot",
"CXX": "[START_DIR]/cipd/bin/clang++",
- "LDFLAGS": "--sysroot=[START_DIR]/cipd/sysroot -static-libstdc++ -ldl -lpthread"
+ "LDFLAGS": "--sysroot=[START_DIR]/cipd/sysroot"
},
"name": "release.build.generate",
"~followup_annotations": [
@@ -183,7 +183,7 @@
"CC": "[START_DIR]/cipd/bin/clang",
"CFLAGS": "--sysroot=[START_DIR]/cipd/sysroot",
"CXX": "[START_DIR]/cipd/bin/clang++",
- "LDFLAGS": "--sysroot=[START_DIR]/cipd/sysroot -static-libstdc++ -ldl -lpthread"
+ "LDFLAGS": "--sysroot=[START_DIR]/cipd/sysroot"
},
"name": "release.build.ninja",
"~followup_annotations": [
diff --git a/infra/recipes/gn.expected/cipd_register.json b/infra/recipes/gn.expected/cipd_register.json
index a626fa6..76efe86 100644
--- a/infra/recipes/gn.expected/cipd_register.json
+++ b/infra/recipes/gn.expected/cipd_register.json
@@ -104,7 +104,7 @@
"CC": "[START_DIR]/cipd/bin/clang",
"CFLAGS": "--sysroot=[START_DIR]/cipd/sysroot",
"CXX": "[START_DIR]/cipd/bin/clang++",
- "LDFLAGS": "--sysroot=[START_DIR]/cipd/sysroot -static-libstdc++ -ldl -lpthread"
+ "LDFLAGS": "--sysroot=[START_DIR]/cipd/sysroot"
},
"name": "debug.build.generate",
"~followup_annotations": [
@@ -123,7 +123,7 @@
"CC": "[START_DIR]/cipd/bin/clang",
"CFLAGS": "--sysroot=[START_DIR]/cipd/sysroot",
"CXX": "[START_DIR]/cipd/bin/clang++",
- "LDFLAGS": "--sysroot=[START_DIR]/cipd/sysroot -static-libstdc++ -ldl -lpthread"
+ "LDFLAGS": "--sysroot=[START_DIR]/cipd/sysroot"
},
"name": "debug.build.ninja",
"~followup_annotations": [
@@ -164,7 +164,7 @@
"CC": "[START_DIR]/cipd/bin/clang",
"CFLAGS": "--sysroot=[START_DIR]/cipd/sysroot",
"CXX": "[START_DIR]/cipd/bin/clang++",
- "LDFLAGS": "--sysroot=[START_DIR]/cipd/sysroot -static-libstdc++ -ldl -lpthread"
+ "LDFLAGS": "--sysroot=[START_DIR]/cipd/sysroot"
},
"name": "release.build.generate",
"~followup_annotations": [
@@ -183,7 +183,7 @@
"CC": "[START_DIR]/cipd/bin/clang",
"CFLAGS": "--sysroot=[START_DIR]/cipd/sysroot",
"CXX": "[START_DIR]/cipd/bin/clang++",
- "LDFLAGS": "--sysroot=[START_DIR]/cipd/sysroot -static-libstdc++ -ldl -lpthread"
+ "LDFLAGS": "--sysroot=[START_DIR]/cipd/sysroot"
},
"name": "release.build.ninja",
"~followup_annotations": [
diff --git a/infra/recipes/gn.expected/cq_linux.json b/infra/recipes/gn.expected/cq_linux.json
index 6c00b06..8fe2ad2 100644
--- a/infra/recipes/gn.expected/cq_linux.json
+++ b/infra/recipes/gn.expected/cq_linux.json
@@ -131,7 +131,7 @@
"CC": "[START_DIR]/cipd/bin/clang",
"CFLAGS": "--sysroot=[START_DIR]/cipd/sysroot",
"CXX": "[START_DIR]/cipd/bin/clang++",
- "LDFLAGS": "--sysroot=[START_DIR]/cipd/sysroot -static-libstdc++ -ldl -lpthread"
+ "LDFLAGS": "--sysroot=[START_DIR]/cipd/sysroot"
},
"name": "debug.build.generate",
"~followup_annotations": [
@@ -150,7 +150,7 @@
"CC": "[START_DIR]/cipd/bin/clang",
"CFLAGS": "--sysroot=[START_DIR]/cipd/sysroot",
"CXX": "[START_DIR]/cipd/bin/clang++",
- "LDFLAGS": "--sysroot=[START_DIR]/cipd/sysroot -static-libstdc++ -ldl -lpthread"
+ "LDFLAGS": "--sysroot=[START_DIR]/cipd/sysroot"
},
"name": "debug.build.ninja",
"~followup_annotations": [
@@ -191,7 +191,7 @@
"CC": "[START_DIR]/cipd/bin/clang",
"CFLAGS": "--sysroot=[START_DIR]/cipd/sysroot",
"CXX": "[START_DIR]/cipd/bin/clang++",
- "LDFLAGS": "--sysroot=[START_DIR]/cipd/sysroot -static-libstdc++ -ldl -lpthread"
+ "LDFLAGS": "--sysroot=[START_DIR]/cipd/sysroot"
},
"name": "release.build.generate",
"~followup_annotations": [
@@ -210,7 +210,7 @@
"CC": "[START_DIR]/cipd/bin/clang",
"CFLAGS": "--sysroot=[START_DIR]/cipd/sysroot",
"CXX": "[START_DIR]/cipd/bin/clang++",
- "LDFLAGS": "--sysroot=[START_DIR]/cipd/sysroot -static-libstdc++ -ldl -lpthread"
+ "LDFLAGS": "--sysroot=[START_DIR]/cipd/sysroot"
},
"name": "release.build.ninja",
"~followup_annotations": [
diff --git a/infra/recipes/gn.py b/infra/recipes/gn.py
index c19672e..7a079b5 100644
--- a/infra/recipes/gn.py
+++ b/infra/recipes/gn.py
@@ -81,7 +81,7 @@
'CXX': cipd_dir.join('bin', 'clang++'),
'AR': cipd_dir.join('bin', 'llvm-ar'),
'CFLAGS': sysroot,
- 'LDFLAGS': '%s -static-libstdc++ -ldl -lpthread' % sysroot,
+ 'LDFLAGS': sysroot,
}
elif api.platform.is_mac:
sysroot = '--sysroot=%s' % api.step(
