diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2013-12-24 20:07:03 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2013-12-24 20:07:03 +0000 |
| commit | ac2fdeae2923aea8f41387685165e0290671c932 (patch) | |
| tree | 984b56029dd579766c19619f41f2e63c2530e252 /sys-devel | |
| parent | old (diff) | |
| download | gentoo-2-ac2fdeae2923aea8f41387685165e0290671c932.tar.gz gentoo-2-ac2fdeae2923aea8f41387685165e0290671c932.tar.bz2 gentoo-2-ac2fdeae2923aea8f41387685165e0290671c932.zip | |
Fix libLTO linking parallel make issue, bug #494922.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'sys-devel')
| -rw-r--r-- | sys-devel/llvm/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-devel/llvm/llvm-9999.ebuild | 19 |
2 files changed, 18 insertions, 6 deletions
diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog index 90e24976d6ac..d15efd379bc0 100644 --- a/sys-devel/llvm/ChangeLog +++ b/sys-devel/llvm/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-devel/llvm # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.156 2013/12/24 10:09:13 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.157 2013/12/24 20:07:03 mgorny Exp $ + + 24 Dec 2013; Michał Górny <mgorny@gentoo.org> llvm-9999.ebuild: + Fix libLTO linking parallel make issue, bug #494922. 24 Dec 2013; Michał Górny <mgorny@gentoo.org> llvm-9999.ebuild: Create the gold plugin symlink only with USE=gold. diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild index c88e180c125b..2c7c9c4989d5 100644 --- a/sys-devel/llvm/llvm-9999.ebuild +++ b/sys-devel/llvm/llvm-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.70 2013/12/24 10:09:13 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.71 2013/12/24 20:07:03 mgorny Exp $ EAPI=5 @@ -272,14 +272,21 @@ set_makeargs() { use clang && tools+=( clang ) if multilib_build_binaries; then - use gold && tools+=( gold ) tools+=( opt llvm-as llvm-dis llc llvm-ar llvm-nm llvm-link lli llvm-extract llvm-mc llvm-bcanalyzer llvm-diff macho-dump llvm-objdump llvm-readobj llvm-rtdyld llvm-dwarfdump llvm-cov llvm-size llvm-stress llvm-mcmarkup llvm-symbolizer obj2yaml - yaml2obj lto llvm-lto + yaml2obj lto ) + + # those tools require 'lto' built first, so we need to delay + # building them to a second run + if [[ ${1} != -1 ]]; then + tools+=( llvm-lto ) + + use gold && tools+=( gold ) + fi fi MAKEARGS+=( @@ -294,11 +301,13 @@ set_makeargs() { multilib_src_compile() { local MAKEARGS - set_makeargs - + set_makeargs -1 emake "${MAKEARGS[@]}" if multilib_build_binaries; then + set_makeargs + emake -C tools "${MAKEARGS[@]}" + emake -C "${S}"/docs -f Makefile.sphinx man use clang && emake -C "${S}"/tools/clang/docs/tools \ BUILD_FOR_WEBSITE=1 DST_MAN_DIR="${T}"/ man |