diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2019-03-06 14:35:30 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2019-03-06 14:35:30 +0000 |
| commit | 1b3d0395cf8d900ab007ce1428d56d7ad604a503 (patch) | |
| tree | 4bd697d5e74168d5ce27da715df849d550144b44 | |
| parent | fbd9663ad618081ad716b2836dc30c828bd1507e (diff) | |
When linking libLLVM.a in clang and lld include it within the
ld --start-group --end-group block. bfd ld seems to need this where
lld doesn't.
| -rw-r--r-- | gnu/usr.bin/clang/clang/Makefile | 8 | ||||
| -rw-r--r-- | gnu/usr.bin/clang/llc/Makefile | 9 | ||||
| -rw-r--r-- | gnu/usr.bin/clang/lld/Makefile | 8 |
3 files changed, 10 insertions, 15 deletions
diff --git a/gnu/usr.bin/clang/clang/Makefile b/gnu/usr.bin/clang/clang/Makefile index c0383de739d..f46e5653e9d 100644 --- a/gnu/usr.bin/clang/clang/Makefile +++ b/gnu/usr.bin/clang/clang/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2019/03/05 09:44:39 jsg Exp $ +# $OpenBSD: Makefile,v 1.14 2019/03/06 14:35:28 jsg Exp $ .include <bsd.own.mk> @@ -28,7 +28,8 @@ CPPFLAGS+= -I${.CURDIR}/../../../llvm/tools/clang/include .PATH: ${.CURDIR}/../../../llvm/tools/clang/tools/driver -LLVM_LIBDEPS= clangFrontendTool \ +LLVM_LIBDEPS= LLVM \ + clangFrontendTool \ clangFrontend \ clangDriver \ clangDriverArch \ @@ -45,7 +46,4 @@ LLVM_LIBDEPS= clangFrontendTool \ clangBasic \ clangBasicTargets -DPADD+= ${.OBJDIR}/../libLLVM/libLLVM.a -LDADD+= ${.OBJDIR}/../libLLVM/libLLVM.a - .include <bsd.prog.mk> diff --git a/gnu/usr.bin/clang/llc/Makefile b/gnu/usr.bin/clang/llc/Makefile index f2f3b468dbc..81c783f7eeb 100644 --- a/gnu/usr.bin/clang/llc/Makefile +++ b/gnu/usr.bin/clang/llc/Makefile @@ -1,4 +1,6 @@ -# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:42 jsg Exp $ +# $OpenBSD: Makefile,v 1.4 2019/03/06 14:35:28 jsg Exp $ + +.include <bsd.own.mk> PROG= llc NOMAN= @@ -7,9 +9,6 @@ SRCS= llc.cpp .PATH: ${.CURDIR}/../../../llvm/tools/llc -LLVM_LIBDEPS= - -DPADD+= ${.OBJDIR}/../libLLVM/libLLVM.a -LDADD+= ${.OBJDIR}/../libLLVM/libLLVM.a +LLVM_LIBDEPS= LLVM .include <bsd.prog.mk> diff --git a/gnu/usr.bin/clang/lld/Makefile b/gnu/usr.bin/clang/lld/Makefile index 7d167f34b94..9afeca71bfe 100644 --- a/gnu/usr.bin/clang/lld/Makefile +++ b/gnu/usr.bin/clang/lld/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.15 2019/03/05 09:44:42 jsg Exp $ +# $OpenBSD: Makefile,v 1.16 2019/03/06 14:35:29 jsg Exp $ .include <bsd.own.mk> @@ -18,11 +18,9 @@ CPPFLAGS+= -I${.CURDIR}/../../../llvm/tools/lld/include .PATH: ${.CURDIR}/../../../llvm/tools/lld/tools/lld .PATH: ${.CURDIR}/../../../llvm/tools/lld/docs -LLVM_LIBDEPS= lldELF \ +LLVM_LIBDEPS= LLVM \ + lldELF \ lldCommon \ lldCore -DPADD+= ${.OBJDIR}/../libLLVM/libLLVM.a -LDADD+= ${.OBJDIR}/../libLLVM/libLLVM.a - .include <bsd.prog.mk> |