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