diff options
| -rw-r--r-- | lang/libLLVM/Makefile | 17 | ||||
| -rw-r--r-- | lang/libLLVM34/Makefile | 17 |
2 files changed, 32 insertions, 2 deletions
diff --git a/lang/libLLVM/Makefile b/lang/libLLVM/Makefile index b6ee9256eb5..a21bc467119 100644 --- a/lang/libLLVM/Makefile +++ b/lang/libLLVM/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2015/04/06 17:25:05 tnn Exp $ +# $NetBSD: Makefile,v 1.3 2015/04/25 20:20:32 tnn Exp $ PKGNAME= ${DISTNAME:S/clang/libLLVM/} PKGREVISION= 1 @@ -33,4 +33,19 @@ LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/libLLVM INSTALLATION_DIRS+= lib/libLLVM +# XXX temporary band-aid for wrapper reordering bug until we have a proper fix +# +# Wrappers incorrectly reorder: +# +# -Wl,--whole-archive -lmystaticlib -Wl,--no-whole-archive +# +# to +# +# -Wl,--whole-archive -Wl,--no-whole-archive -lmystaticlib +# +# Which nullies the effect of --whole-archive. +# Kludge around this by removing --no-whole-archive from the command line. +# It happens to be safe in this particular case, as far as I can tell. +BUILDLINK_TRANSFORM+= rm:-Wl,--no-whole-archive + .include "../../lang/clang/Makefile.common" diff --git a/lang/libLLVM34/Makefile b/lang/libLLVM34/Makefile index d3dad53e6fe..d683ac8d04b 100644 --- a/lang/libLLVM34/Makefile +++ b/lang/libLLVM34/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2015/04/06 17:25:05 tnn Exp $ +# $NetBSD: Makefile,v 1.6 2015/04/25 20:20:32 tnn Exp $ DISTNAME= llvm-${PKGVERSION_NOREV}.src PKGNAME= libLLVM34-3.4.2 @@ -75,6 +75,21 @@ PLIST_SUBST+= SOEXT="dylib" PLIST_SUBST+= SOEXT="so" .endif +# XXX temporary band-aid for wrapper reordering bug until we have a proper fix +# +# Wrappers incorrectly reorder: +# +# -Wl,--whole-archive -lmystaticlib -Wl,--no-whole-archive +# +# to +# +# -Wl,--whole-archive -Wl,--no-whole-archive -lmystaticlib +# +# Which nullies the effect of --whole-archive. +# Kludge around this by removing --no-whole-archive from the command line. +# It happens to be safe in this particular case, as far as I can tell. +BUILDLINK_TRANSFORM+= rm:-Wl,--no-whole-archive + .include "../../devel/zlib/buildlink3.mk" .include "../../lang/python/tool.mk" .include "../../mk/bsd.pkg.mk" |