diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2017-08-11 16:33:18 +0200 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2017-08-11 16:35:09 +0200 |
| commit | 28dd7e772d7245723a725ea13673b3419139cd43 (patch) | |
| tree | 5578cff697cd675285faf3b587e26f36e9af9e3f /eclass | |
| parent | package.mask: Unleash samba-4.6 into ~arch. (diff) | |
| download | gentoo-28dd7e772d7245723a725ea13673b3419139cd43.tar.gz gentoo-28dd7e772d7245723a725ea13673b3419139cd43.tar.bz2 gentoo-28dd7e772d7245723a725ea13673b3419139cd43.zip | |
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
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/flag-o-matic.eclass | 3 | ||||
| -rwxr-xr-x | eclass/tests/flag-o-matic.sh | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass index 4ef32c519f22..b2f3742b3ecf 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 24f2a4c4af4e..92c68b82c3c9 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 |