diff options
| author | sjg <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
| commit | d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2 (patch) | |
| tree | b04f4bd7cd887f50e7d98af35f46b9834ff86c80 /usr.bin/clang | |
| parent | 3c8e37b1d04827f33c0c9a7594bd1b1ef7cdb3d3 (diff) | |
| parent | 4fbde208c6460d576f64d6dc3cdc6cab085a4283 (diff) | |
| download | FreeBSD-src-d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2.zip FreeBSD-src-d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2.tar.gz | |
Merge head from 7/28
Diffstat (limited to 'usr.bin/clang')
| -rw-r--r-- | usr.bin/clang/clang-tblgen/Makefile | 2 | ||||
| -rw-r--r-- | usr.bin/clang/clang-tblgen/Makefile.depend | 2 | ||||
| -rw-r--r-- | usr.bin/clang/clang.prog.mk | 6 | ||||
| -rw-r--r-- | usr.bin/clang/clang/Makefile | 4 | ||||
| -rw-r--r-- | usr.bin/clang/clang/Makefile.depend | 2 | ||||
| -rw-r--r-- | usr.bin/clang/tblgen/Makefile | 2 | ||||
| -rw-r--r-- | usr.bin/clang/tblgen/Makefile.depend | 2 |
7 files changed, 13 insertions, 7 deletions
diff --git a/usr.bin/clang/clang-tblgen/Makefile b/usr.bin/clang/clang-tblgen/Makefile index 0f64ad3..34e7aeb 100644 --- a/usr.bin/clang/clang-tblgen/Makefile +++ b/usr.bin/clang/clang-tblgen/Makefile @@ -19,4 +19,6 @@ SRCS= ClangASTNodesEmitter.cpp \ LIBDEPS=llvmtablegen \ llvmsupport +NO_PIE= yes + .include "../clang.prog.mk" diff --git a/usr.bin/clang/clang-tblgen/Makefile.depend b/usr.bin/clang/clang-tblgen/Makefile.depend index 70ecfef..71f237e 100644 --- a/usr.bin/clang/clang-tblgen/Makefile.depend +++ b/usr.bin/clang/clang-tblgen/Makefile.depend @@ -13,7 +13,7 @@ DIRDEPS = \ lib/libc++ \ lib/libcompiler_rt \ lib/msun \ - lib/ncurses/ncurses \ + lib/ncurses/ncursesw \ .include <dirdeps.mk> diff --git a/usr.bin/clang/clang.prog.mk b/usr.bin/clang/clang.prog.mk index 8d3f536..b127a77 100644 --- a/usr.bin/clang/clang.prog.mk +++ b/usr.bin/clang/clang.prog.mk @@ -1,5 +1,7 @@ # $FreeBSD$ +NO_PIE= yes + LLVM_SRCS= ${.CURDIR}/../../../contrib/llvm .include "../../lib/clang/clang.build.mk" @@ -9,8 +11,8 @@ DPADD+= ${.OBJDIR}/../../../lib/clang/lib${lib}/lib${lib}.a LDADD+= ${.OBJDIR}/../../../lib/clang/lib${lib}/lib${lib}.a .endfor -DPADD+= ${LIBNCURSES} -LDADD+= -lncurses +DPADD+= ${LIBNCURSESW} +LDADD+= -lncursesw BINDIR?= /usr/bin diff --git a/usr.bin/clang/clang/Makefile b/usr.bin/clang/clang/Makefile index 74ef867..345efde 100644 --- a/usr.bin/clang/clang/Makefile +++ b/usr.bin/clang/clang/Makefile @@ -36,7 +36,7 @@ TGHDRS= CC1AsOptions \ DiagnosticSemaKinds \ Options -.if !defined(EARLY_BUILD) && defined(MK_CLANG_FULL) && ${MK_CLANG_FULL} != "no" +.if ${MK_CLANG_FULL} != "no" _clangstaticanalyzer= \ clangstaticanalyzerfrontend \ clangstaticanalyzercheckers \ @@ -46,7 +46,7 @@ _clangarcmigrate= \ _clangrewriter= \ clangrewritefrontend \ clangrewritecore -.endif # !EARLY_BUILD && MK_CLANG_FULL +.endif # MK_CLANG_FULL LIBDEPS=clangfrontendtool \ clangfrontend \ diff --git a/usr.bin/clang/clang/Makefile.depend b/usr.bin/clang/clang/Makefile.depend index f741403..64aadbc 100644 --- a/usr.bin/clang/clang/Makefile.depend +++ b/usr.bin/clang/clang/Makefile.depend @@ -83,7 +83,7 @@ DIRDEPS = \ lib/libc++ \ lib/libcompiler_rt \ lib/msun \ - lib/ncurses/ncurses \ + lib/ncurses/ncursesw \ usr.bin/clang/clang-tblgen.host \ usr.bin/clang/tblgen.host \ diff --git a/usr.bin/clang/tblgen/Makefile b/usr.bin/clang/tblgen/Makefile index f06150e..31fdc20 100644 --- a/usr.bin/clang/tblgen/Makefile +++ b/usr.bin/clang/tblgen/Makefile @@ -42,4 +42,6 @@ SRCS= AsmMatcherEmitter.cpp \ LIBDEPS=llvmtablegen \ llvmsupport +NO_PIE= yes + .include "../clang.prog.mk" diff --git a/usr.bin/clang/tblgen/Makefile.depend b/usr.bin/clang/tblgen/Makefile.depend index 70ecfef..71f237e 100644 --- a/usr.bin/clang/tblgen/Makefile.depend +++ b/usr.bin/clang/tblgen/Makefile.depend @@ -13,7 +13,7 @@ DIRDEPS = \ lib/libc++ \ lib/libcompiler_rt \ lib/msun \ - lib/ncurses/ncurses \ + lib/ncurses/ncursesw \ .include <dirdeps.mk> |
