fix sed rule, add ldflags back

This commit is contained in:
Alexander Stefanov 2019-04-16 11:07:36 +00:00
parent 6d592b9d69
commit 5bdc9c52d7

View file

@ -835,7 +835,7 @@ function BuildGlibc() {
BuildCC="%{__cc} $BuildCompFlags"
BuildCXX="%{__cxx} $BuildCompFlags"
add_flags="%(rpm --eval '%%{__common_cflags}' |sed -e 's,-Werror[^ ]*,,g';;s,-ffat-lto-objects,,g)"
add_flags="%(rpm --eval '%%{__common_cflags}' |sed -e 's,-Werror[^ ]*,,g;s,-ffat-lto-objects,,g')"
BuildFlags="$BuildFlags -DNDEBUG=1 $addflags -O3"
# XXX: -frecord-gcc-switches makes gold abort with assertion error and gcc segfault :|
@ -875,7 +875,7 @@ function BuildGlibc() {
pushd build-$arch-linux
[[ "$BuildAltArch" = "yes" ]] && touch ".alt" || touch ".main"
CC="$BuildCC" CXX="$BuildCXX" CFLAGS="$BuildFlags -Wno-error -fno-strict-aliasing" ../configure \
CC="$BuildCC" CXX="$BuildCXX" CFLAGS="$BuildFlags -Wno-error -fno-strict-aliasing" LDFLAGS="%{ldflags} -fuse-ld=bfd" ../configure \
$arch-%{_target_vendor}-%{_target_os}%{?_gnu} \
--disable-werror \
--prefix=%{_prefix} \
@ -1196,4 +1196,3 @@ done
# some info is kept that's required to make valgrind work without depending on glibc-debug
# package to be installed.
export EXCLUDE_FROM_FULL_STRIP="ld-%{version}.so libpthread libc-%{version}.so libm-%{version}.so"