diff options
| author | tnn <tnn@pkgsrc.org> | 2015-04-25 22:06:42 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2015-04-25 22:06:42 +0000 |
| commit | bb1b3f5b353bde0a0f464eb5e1fad7c4ad6af653 (patch) | |
| tree | cb5e4f2fa51d939a5bcd73e8e14747c0960a6750 /lang | |
| parent | 058aee2fd5b7eceda78cc2bcd34ae81b52a08b9a (diff) | |
| download | pkgsrc-bb1b3f5b353bde0a0f464eb5e1fad7c4ad6af653.tar.gz | |
revert previous hack, it doesn't work due to -lgcc.
Will fix it in wrappers instead.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/libLLVM/Makefile | 17 | ||||
| -rw-r--r-- | lang/libLLVM34/Makefile | 17 |
2 files changed, 2 insertions, 32 deletions
diff --git a/lang/libLLVM/Makefile b/lang/libLLVM/Makefile index a21bc467119..306f84f6d15 100644 --- a/lang/libLLVM/Makefile +++ b/lang/libLLVM/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2015/04/25 20:20:32 tnn Exp $ +# $NetBSD: Makefile,v 1.4 2015/04/25 22:06:42 tnn Exp $ PKGNAME= ${DISTNAME:S/clang/libLLVM/} PKGREVISION= 1 @@ -33,19 +33,4 @@ 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 d683ac8d04b..901a904921b 100644 --- a/lang/libLLVM34/Makefile +++ b/lang/libLLVM34/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2015/04/25 20:20:32 tnn Exp $ +# $NetBSD: Makefile,v 1.7 2015/04/25 22:06:42 tnn Exp $ DISTNAME= llvm-${PKGVERSION_NOREV}.src PKGNAME= libLLVM34-3.4.2 @@ -75,21 +75,6 @@ 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" |