|
Lines 1-7
Link Here
|
| 1 |
- Fix awk detection |
1 |
- Fix awk detection |
| 2 |
|
2 |
|
|
|
3 |
- also look in stderr for readelf --help output (elftoolchain bsd readelf) |
| 4 |
|
| 3 |
Index: moz.configure |
5 |
Index: moz.configure |
| 4 |
--- moz.configure.orig 2022-03-30 19:25:49 UTC |
6 |
--- moz.configure.orig 2022-10-10 09:55:56 UTC |
| 5 |
+++ moz.configure |
7 |
+++ moz.configure |
| 6 |
@@ -708,7 +708,7 @@ add_old_configure_assignment("CLANG_PLUGIN", clang_plu |
8 |
@@ -708,7 +708,7 @@ add_old_configure_assignment("CLANG_PLUGIN", clang_plu |
| 7 |
|
9 |
|
|
Lines 12-14
Index: moz.configure
Link Here
|
| 12 |
|
14 |
|
| 13 |
# Until the AWK variable is not necessary in old-configure |
15 |
# Until the AWK variable is not necessary in old-configure |
| 14 |
|
16 |
|
|
|
17 |
@@ -812,7 +812,8 @@ def validate_readelf(path): |
| 18 |
# option in the `--help` output, which fortunately, s compatible between |
| 19 |
# llvm-readelf and readelf. |
| 20 |
retcode, stdout, stderr = get_cmd_output(path, "--help") |
| 21 |
- return retcode == 0 and any(l.startswith(" -d ") for l in stdout.splitlines()) |
| 22 |
+ return retcode == 0 and (any(l.startswith(" -d ") for l in stdout.splitlines()) \ |
| 23 |
+ or any(l.startswith(" -d ") for l in stderr.splitlines())) |
| 24 |
|
| 25 |
|
| 26 |
@depends("--enable-compile-environment", target, host) |