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

diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass
index 4ef32c519f22745cd9467d34c802c6aff537db8e..b2f3742b3ecfc5804970eb0da633122d1778eedd 100644 (file)
--- 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 24f2a4c4af4ef6fbf378aa7aa5e2fea0de7c1290..92c68b82c3c906077c5fd72789f65ca383c7ad78 100755 (executable)
--- 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