diff options
author | tnn <tnn@pkgsrc.org> | 2015-03-04 13:57:42 +0000 |
---|---|---|
committer | tnn <tnn@pkgsrc.org> | 2015-03-04 13:57:42 +0000 |
commit | 6f7b7c2f3d22d447334aee634645b085b0988d7d (patch) | |
tree | 0be3e52f712a8630b1b4aa528002b30baf758ba0 | |
parent | 671ea9dd85493a29e0ac9cb471b9ba8f33162295 (diff) | |
download | pkgsrc-6f7b7c2f3d22d447334aee634645b085b0988d7d.tar.gz |
Makefile: move some stuff from Makefile.common here
PLIST: unsubstitute ${MACHINE_ARCH}
-rw-r--r-- | lang/clang/Makefile | 6 | ||||
-rw-r--r-- | lang/clang/Makefile.common | 7 | ||||
-rw-r--r-- | lang/clang/PLIST | 4 |
3 files changed, 8 insertions, 9 deletions
diff --git a/lang/clang/Makefile b/lang/clang/Makefile index 60bec320ad1..28f17679590 100644 --- a/lang/clang/Makefile +++ b/lang/clang/Makefile @@ -1,4 +1,8 @@ -# $NetBSD: Makefile,v 1.37 2015/03/04 09:59:57 tnn Exp $ +# $NetBSD: Makefile,v 1.38 2015/03/04 13:57:42 tnn Exp $ + +MAKE_DIRS= etc/llvm +INSTALLATION_DIRS= bin lib libexec .include "../../lang/clang/options.mk" +.include "../../textproc/libxml2/buildlink3.mk" .include "../../lang/clang/Makefile.common" diff --git a/lang/clang/Makefile.common b/lang/clang/Makefile.common index 30ba2df624a..3832aa09a23 100644 --- a/lang/clang/Makefile.common +++ b/lang/clang/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.1 2015/03/04 09:59:57 tnn Exp $ +# $NetBSD: Makefile.common,v 1.2 2015/03/04 13:57:42 tnn Exp $ # # used by lang/clang/Makefile # used by lang/libLLVM/Makefile @@ -27,10 +27,6 @@ CONFIGURE_ARGS+= --disable-bindings # disable OCaml CONFIGURE_ARGS+= --disable-timestamps CONFIGURE_ARGS+= --enable-optimized -MAKE_DIRS+= etc/llvm - -INSTALLATION_DIRS= bin lib libexec - CHECK_PORTABILITY_SKIP= utils/buildit/build_llvm TEST_TARGET= check unittests @@ -97,5 +93,4 @@ post-extract: .endif .include "../../lang/python/tool.mk" -.include "../../textproc/libxml2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/clang/PLIST b/lang/clang/PLIST index 00db3a0561f..485bfe3ce26 100644 --- a/lang/clang/PLIST +++ b/lang/clang/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.15 2015/03/03 12:04:08 tnn Exp $ +@comment $NetBSD: PLIST,v 1.16 2015/03/04 13:57:42 tnn Exp $ bin/FileCheck bin/bugpoint bin/c-index-test @@ -1078,7 +1078,7 @@ include/llvm/Support/ELFRelocs/PowerPC64.def include/llvm/Support/ELFRelocs/Sparc.def include/llvm/Support/ELFRelocs/SystemZ.def include/llvm/Support/ELFRelocs/i386.def -include/llvm/Support/ELFRelocs/${MACHINE_ARCH}.def +include/llvm/Support/ELFRelocs/x86_64.def include/llvm/Support/Endian.h include/llvm/Support/EndianStream.h include/llvm/Support/Errc.h |