diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2011-10-18 16:43:44 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2011-10-18 16:43:44 +0000 |
| commit | 91f689480938afa37bdb78e8cf98a848f174f705 (patch) | |
| tree | c81016d67729cb681dac2b217d5cc7b06dc746e8 /sys-devel | |
| parent | Fix building with libpng15 wrt #387553 by Daniel Savard (diff) | |
| download | gentoo-2-91f689480938afa37bdb78e8cf98a848f174f705.tar.gz gentoo-2-91f689480938afa37bdb78e8cf98a848f174f705.tar.bz2 gentoo-2-91f689480938afa37bdb78e8cf98a848f174f705.zip | |
Fix USE=lto compilation thanks to patch from Charles Davis in bug #387481
(Portage version: 2.2.01.19478-prefix/cvs/Darwin i386)
Diffstat (limited to 'sys-devel')
| -rw-r--r-- | sys-devel/binutils-apple/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-devel/binutils-apple/files/ld64-123.2-Makefile | 13 |
2 files changed, 12 insertions, 6 deletions
diff --git a/sys-devel/binutils-apple/ChangeLog b/sys-devel/binutils-apple/ChangeLog index 2bbe49e53474..4c0024a758c9 100644 --- a/sys-devel/binutils-apple/ChangeLog +++ b/sys-devel/binutils-apple/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-devel/binutils-apple # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/ChangeLog,v 1.21 2011/09/25 09:32:15 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/ChangeLog,v 1.22 2011/10/18 16:43:44 grobian Exp $ + + 18 Oct 2011; Fabian Groffen <grobian@gentoo.org> files/ld64-123.2-Makefile: + Fix USE=lto compilation thanks to patch from Charles Davis in bug #387481 25 Sep 2011; Fabian Groffen <grobian@gentoo.org> binutils-apple-4.1.ebuild: Make x86 thread defines available on PPC to fix compilation, bug #384339 diff --git a/sys-devel/binutils-apple/files/ld64-123.2-Makefile b/sys-devel/binutils-apple/files/ld64-123.2-Makefile index bd60c60cff0f..bf8c8a040b99 100644 --- a/sys-devel/binutils-apple/files/ld64-123.2-Makefile +++ b/sys-devel/binutils-apple/files/ld64-123.2-Makefile @@ -18,14 +18,17 @@ LD64LIBS=ld/parsers/archive_file.o ld/parsers/macho_relocatable_file.o \ ld/Options.o ld/Resolver.o ld/debugline.o ld/ld.o ifeq ($(LTO),1) -LD64LIBS += ld/parsers/lto_file.o CPPFLAGS += "-DLTO" +LTO_OBJ = ld/parsers/lto_file.o +LIBLTO = -lLTO else CPPFLAGS += "-ULTO" +LTO_OBJ = +LIBLTO = endif -ld64: libprunetrie.a $(LD64LIBS) version.o - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ +ld64: libprunetrie.a version.o $(LTO_OBJ) + $(CXX) $(CXXFLAGS) $(LDFLAGS) $(LIBLTO) -o $@ $^ rebase: other/rebase.o $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ @@ -36,8 +39,8 @@ dyldinfo: other/dyldinfo.o unwinddump: other/unwinddump.o $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ -ObjectDump: other/ObjectDump.o ld/debugline.o ld/parsers/macho_relocatable_file.o - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ +ObjectDump: other/ObjectDump.o ld/debugline.o ld/parsers/macho_relocatable_file.o $(LTO_OBJ) + $(CXX) $(CXXFLAGS) $(LDFLAGS) $(LIBLTO) -o $@ $^ machocheck: other/machochecker.o $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ |