Use default LDFLAGS/CXXFLAGS/CFLAGS and filter out flags not supported by clang
This commit is contained in:
parent
d9d8c1455e
commit
d603aee505
13
libcxx.spec
13
libcxx.spec
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
Name: libcxx
|
Name: libcxx
|
||||||
Version: 6.0.0
|
Version: 6.0.0
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: C++ standard library targeting C++11
|
Summary: C++ standard library targeting C++11
|
||||||
License: MIT or NCSA
|
License: MIT or NCSA
|
||||||
URL: http://libcxx.llvm.org/
|
URL: http://libcxx.llvm.org/
|
||||||
|
@ -55,10 +55,10 @@ cd _build
|
||||||
%global optflags %(echo %{optflags} | sed 's/-march=z9-109 /-march=z10 /')
|
%global optflags %(echo %{optflags} | sed 's/-march=z9-109 /-march=z10 /')
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
export LDFLAGS="-Wl,--build-id"
|
|
||||||
#Filter out cxxflags not supported by clang
|
# Filter out cflags not supported by clang.
|
||||||
export CXXFLAGS=`echo $CXXFLAGS -Qunused-arguments | sed 's/-fstack-clash-protection//g'`
|
%global optflags %(echo %{optflags} | sed -e 's/-mcet//g' -e 's/-fcf-protection//g')
|
||||||
export CFLAGS=`echo $CFLAGS -Qunused-arguments`
|
|
||||||
# Clang in older releases than f24 can't build this code without crashing.
|
# Clang in older releases than f24 can't build this code without crashing.
|
||||||
# So, we use gcc there. But the really old version in RHEL 6 works. Huh.
|
# So, we use gcc there. But the really old version in RHEL 6 works. Huh.
|
||||||
%cmake .. \
|
%cmake .. \
|
||||||
|
@ -113,6 +113,9 @@ make install DESTDIR=%{buildroot}
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Mar 21 2018 Tom Stellard <tstellar@redhat.com> - 6.0.0-2
|
||||||
|
- Use default LDFLAGS/CXXFLAGS/CFLAGS and filter out flags not supported by clang
|
||||||
|
|
||||||
* Wed Mar 14 2018 Tom Callaway <spot@fedoraproject.org> - 6.0.0-1
|
* Wed Mar 14 2018 Tom Callaway <spot@fedoraproject.org> - 6.0.0-1
|
||||||
- 6.0.0 final
|
- 6.0.0 final
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue