Skip to content

Commit

Permalink
temporary band-aid for wrapper reordering bug until we have a proper fix
Browse files Browse the repository at this point in the history
  • Loading branch information
tnn committed Apr 25, 2015
1 parent 238dcb1 commit 94acf6f
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 2 deletions.
17 changes: 16 additions & 1 deletion 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
Expand Down Expand Up @@ -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"
17 changes: 16 additions & 1 deletion 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
Expand Down Expand Up @@ -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"

0 comments on commit 94acf6f

Please sign in to comment.