| 1 |
commit: 28dd7e772d7245723a725ea13673b3419139cd43 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 11 14:33:18 2017 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 11 14:35:09 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28dd7e77 |
| 7 |
|
| 8 |
flag-o-matic.eclass: Revert "Strip LDFLAGS unsupported by the C..." |
| 9 |
|
| 10 |
The current logic strips too much, causing build failures. Revert it |
| 11 |
until we get it right. |
| 12 |
|
| 13 |
Bug: https://bugs.gentoo.org/627474 |
| 14 |
|
| 15 |
eclass/flag-o-matic.eclass | 3 --- |
| 16 |
eclass/tests/flag-o-matic.sh | 2 +- |
| 17 |
2 files changed, 1 insertion(+), 4 deletions(-) |
| 18 |
|
| 19 |
diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass |
| 20 |
index 4ef32c519f2..b2f3742b3ec 100644 |
| 21 |
--- a/eclass/flag-o-matic.eclass |
| 22 |
+++ b/eclass/flag-o-matic.eclass |
| 23 |
@@ -535,9 +535,6 @@ strip-unsupported-flags() { |
| 24 |
export CXXFLAGS=$(test-flags-CXX ${CXXFLAGS}) |
| 25 |
export FFLAGS=$(test-flags-F77 ${FFLAGS}) |
| 26 |
export FCFLAGS=$(test-flags-FC ${FCFLAGS}) |
| 27 |
- # note: this does not verify the linker flags but it is enough |
| 28 |
- # to strip invalid C flags which are much more likely, #621274 |
| 29 |
- export LDFLAGS=$(test-flags-CC ${LDFLAGS}) |
| 30 |
} |
| 31 |
|
| 32 |
# @FUNCTION: get-flag |
| 33 |
|
| 34 |
diff --git a/eclass/tests/flag-o-matic.sh b/eclass/tests/flag-o-matic.sh |
| 35 |
index 24f2a4c4af4..92c68b82c3c 100755 |
| 36 |
--- a/eclass/tests/flag-o-matic.sh |
| 37 |
+++ b/eclass/tests/flag-o-matic.sh |
| 38 |
@@ -55,7 +55,7 @@ done <<<" |
| 39 |
|
| 40 |
tbegin "strip-unsupported-flags" |
| 41 |
strip-unsupported-flags |
| 42 |
-[[ ${CFLAGS} == "" ]] && [[ ${CXXFLAGS} == "-z=2" ]] && [[ ${LDFLAGS} == "" ]] |
| 43 |
+[[ ${CFLAGS} == "" ]] && [[ ${CXXFLAGS} == "-z=2" ]] |
| 44 |
ftend |
| 45 |
|
| 46 |
for var in $(all-flag-vars) ; do |
Archives