Skip to content

Commit

Permalink
flag-o-matic.eclass: Revert "Strip LDFLAGS unsupported by the C..."
Browse files Browse the repository at this point in the history
The current logic strips too much, causing build failures. Revert it
until we get it right.

Bug: https://bugs.gentoo.org/627474
  • Loading branch information
mgorny committed Aug 11, 2017
1 parent 99c0cdd commit 28dd7e7
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
3 changes: 0 additions & 3 deletions eclass/flag-o-matic.eclass
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion eclass/tests/flag-o-matic.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 28dd7e7

Please sign in to comment.