Accepting request 373722 from devel:tools:compiler
- Use gcc for stage1 bootstrap - Add back libstdc++-devel dependency for clang since libc++ is only available for x86-64 atm. OBS-URL: https://build.opensuse.org/request/show/373722 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/llvm?expand=0&rev=78
This commit is contained in:
commit
440d16f13a
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Mar 16 09:28:51 UTC 2016 - idonmez@suse.com
|
||||||
|
|
||||||
|
- Use gcc for stage1 bootstrap
|
||||||
|
- Add back libstdc++-devel dependency for clang since libc++ is
|
||||||
|
only available for x86-64 atm.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Mar 10 12:05:39 UTC 2016 - idonmez@suse.com
|
Thu Mar 10 12:05:39 UTC 2016 - idonmez@suse.com
|
||||||
|
|
||||||
|
24
llvm.spec
24
llvm.spec
@ -77,11 +77,11 @@ BuildRequires: cmake
|
|||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: flex
|
BuildRequires: flex
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: groff
|
BuildRequires: groff
|
||||||
BuildRequires: libedit-devel
|
BuildRequires: libedit-devel
|
||||||
BuildRequires: libstdc++-devel
|
BuildRequires: libstdc++-devel
|
||||||
BuildRequires: libtool
|
BuildRequires: libtool
|
||||||
BuildRequires: llvm-clang
|
|
||||||
BuildRequires: ncurses-devel
|
BuildRequires: ncurses-devel
|
||||||
BuildRequires: ninja
|
BuildRequires: ninja
|
||||||
BuildRequires: python-base
|
BuildRequires: python-base
|
||||||
@ -116,7 +116,7 @@ new native programs that use the LLVM infrastructure.
|
|||||||
%package clang
|
%package clang
|
||||||
Summary: CLANG frontend for LLVM
|
Summary: CLANG frontend for LLVM
|
||||||
Group: Development/Languages/Other
|
Group: Development/Languages/Other
|
||||||
Provides: clang
|
Requires: libstdc++-devel
|
||||||
|
|
||||||
%description clang
|
%description clang
|
||||||
This package contains the clang (C language) frontend for LLVM.
|
This package contains the clang (C language) frontend for LLVM.
|
||||||
@ -218,21 +218,13 @@ sed -i s,LLVM_REVISION,\"%{_revision}\",g tools/clang/lib/Basic/Version.cpp
|
|||||||
sed -i s,LLDB_REVISION,\"%{_revision}\",g tools/lldb/source/lldb.cpp
|
sed -i s,LLDB_REVISION,\"%{_revision}\",g tools/lldb/source/lldb.cpp
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# ARMv6 needs this exact host triple
|
|
||||||
%ifarch armv6hl
|
|
||||||
cat > autoconf/config.guess << EOF
|
|
||||||
#!/bin/sh
|
|
||||||
echo armv6hl-suse-linux-gnueabi
|
|
||||||
EOF
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
TOPLEVEL=$PWD
|
TOPLEVEL=$PWD
|
||||||
mkdir stage1 stage2
|
mkdir stage1 stage2
|
||||||
pushd stage1
|
pushd stage1
|
||||||
|
|
||||||
export CC=clang
|
export CC=gcc
|
||||||
export CXX=clang++
|
export CXX=g++
|
||||||
|
|
||||||
cmake -G "Ninja" \
|
cmake -G "Ninja" \
|
||||||
-DBUILD_SHARED_LIBS=ON \
|
-DBUILD_SHARED_LIBS=ON \
|
||||||
@ -241,8 +233,8 @@ cmake -G "Ninja" \
|
|||||||
-DLLVM_TARGETS_TO_BUILD=host \
|
-DLLVM_TARGETS_TO_BUILD=host \
|
||||||
-DLLDB_DISABLE_PYTHON=ON \
|
-DLLDB_DISABLE_PYTHON=ON \
|
||||||
%ifarch armv6hl
|
%ifarch armv6hl
|
||||||
-DCMAKE_C_FLAGS="-target armv6hl-suse-linux-gnueabi -mfloat-abi=hard -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp" \
|
-DCMAKE_C_FLAGS="-mfloat-abi=hard -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp" \
|
||||||
-DCMAKE_CXX_FLAGS="-target armv6hl-suse-linux-gnueabi -mfloat-abi=hard -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp" \
|
-DCMAKE_CXX_FLAGS="-mfloat-abi=hard -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp" \
|
||||||
%endif
|
%endif
|
||||||
%ifarch armv7hl
|
%ifarch armv7hl
|
||||||
-DCMAKE_C_FLAGS="-mfloat-abi=hard -march=armv7-a -mtune=cortex-a9 -mfpu=vfpv3-d16" \
|
-DCMAKE_C_FLAGS="-mfloat-abi=hard -march=armv7-a -mtune=cortex-a9 -mfpu=vfpv3-d16" \
|
||||||
@ -267,8 +259,8 @@ cmake -G "Ninja" \
|
|||||||
%endif
|
%endif
|
||||||
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
|
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
|
||||||
%ifarch armv6hl
|
%ifarch armv6hl
|
||||||
-DCMAKE_C_FLAGS="-target armv6hl-suse-linux-gnueabi -mfloat-abi=hard -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp" \
|
-DCMAKE_C_FLAGS="-mfloat-abi=hard -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp" \
|
||||||
-DCMAKE_CXX_FLAGS="-target armv6hl-suse-linux-gnueabi -mfloat-abi=hard -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp" \
|
-DCMAKE_CXX_FLAGS="-mfloat-abi=hard -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp" \
|
||||||
%endif
|
%endif
|
||||||
%ifarch armv7hl
|
%ifarch armv7hl
|
||||||
-DCMAKE_C_FLAGS="-mfloat-abi=hard -march=armv7-a -mtune=cortex-a9 -mfpu=vfpv3-d16" \
|
-DCMAKE_C_FLAGS="-mfloat-abi=hard -march=armv7-a -mtune=cortex-a9 -mfpu=vfpv3-d16" \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user