Another attempt to fix build on i586

Using i586 explicitly in compiler-rt/<...>/clang_linux.mk this time.

The system triple is "i586-unknown-linux-gnu" anyway.
This commit is contained in:
Evgenii Shatokhin 2015-11-25 16:39:09 +03:00
parent 0a665af297
commit 62cfc9e9c7

View file

@ -398,8 +398,8 @@ export CXX=g++
# OSes
%ifarch %ix86
# compiler-rt doesn't support ix86 with x<6 either
export CFLAGS="%{optflags} -march=i686 -D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64"
export CXXFLAGS="%{optflags} -march=i686 -D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -fno-devirtualize"
export CFLAGS="%{optflags} -D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64"
export CXXFLAGS="%{optflags} -D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -fno-devirtualize"
%else
export CXXFLAGS="%{optflags} -fno-devirtualize"
%endif
@ -455,7 +455,7 @@ cd ..
sed -i 's|ActiveLibDir = ActivePrefix + "/lib"|ActiveLibDir = ActivePrefix + "/%{_lib}/%{name}"|g' tools/llvm-config/llvm-config.cpp
# FIXME https://llvm.org/bugs/show_bug.cgi?id=22661
sed -ri "/ifeq.*CompilerTargetArch/s#i386#i686#g" projects/compiler-rt/make/platform/clang_linux.mk
sed -ri "/ifeq.*CompilerTargetArch/s#i386#i586#g" projects/compiler-rt/make/platform/clang_linux.mk
cd build
%make