pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
*llvm*-netbsd: *clang*-netbsd: Prepare for better tests infrastructure
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Mon Jun 12 01:02:58 2017 +0200
Changeset: 3b64d56ee4909240e73507995494af003e0311c9
Modified Files:
clang-netbsd/Makefile.common
clang-netbsd/distinfo
llvm-netbsd/Makefile
Added Files:
llvm-netbsd/Makefile.common
py-llvm-lit-netbsd/DESCR
py-llvm-lit-netbsd/Makefile
py-llvm-lit-netbsd/PLIST
py-llvm-lit-netbsd/distinfo
Removed Files:
clang-netbsd/patches/patch-lib_Driver_ToolChains_NetBSD.cpp
clang-netbsd/patches/patch-test_Driver_netbsd.c
Log Message:
*llvm*-netbsd: *clang*-netbsd: Prepare for better tests infrastructure
- Add initial package for LLVM lit, this is utility needed for tests
in Clang.
- Split LLVM into llvm and py-llvm-lit.
- Drop local patch that was aimed to unbreak LLD on NetBSD, it has
to be redone and it used to break some tests.
Sponsored by <The NetBSD Foundation>
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3b64d56ee4909240e73507995494af003e0311c9
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
clang-netbsd/Makefile.common | 4 +-
clang-netbsd/distinfo | 2 -
.../patches/patch-lib_Driver_ToolChains_NetBSD.cpp | 70 ----
clang-netbsd/patches/patch-test_Driver_netbsd.c | 415 ---------------------
llvm-netbsd/Makefile | 42 +--
llvm-netbsd/Makefile.common | 47 +++
py-llvm-lit-netbsd/DESCR | 7 +
py-llvm-lit-netbsd/Makefile | 23 ++
py-llvm-lit-netbsd/PLIST | 63 ++++
py-llvm-lit-netbsd/distinfo | 14 +
10 files changed, 159 insertions(+), 528 deletions(-)
diffs:
diff --git a/clang-netbsd/Makefile.common b/clang-netbsd/Makefile.common
index 151d573366..c3ef17a028 100644
--- a/clang-netbsd/Makefile.common
+++ b/clang-netbsd/Makefile.common
@@ -100,10 +100,12 @@ PLIST.notdylib= yes
.endif
PLIST_SUBST+= SOEXT=${SOEXT}
-CMAKE_ARGS+= -DLLVM_INCLUDE_TESTS=ON
+BUILD_DEPENDS+= ${PYPKGPREFIX}-llvm-lit-[0-9]*:../../wip/py-llvm-lit-netbsd
+CMAKE_ARGS+= -DLLVM_INCLUDE_TESTS=OFF
CMAKE_ARGS+= -DCLANG_INCLUDE_TESTS=ON
TEST_TARGET= check-clang
TEST_ENV+= LD_LIBRARY_PATH=${WRKDIR}/build/lib
+CMAKE_ARGS+= -DLLVM_LIT=llvm-lit-${PYVERSSUFFIX}
post-extract:
${RUN} mkdir -p ${WRKDIR}/build
diff --git a/clang-netbsd/distinfo b/clang-netbsd/distinfo
index 99a1ac1691..3173a57f02 100644
--- a/clang-netbsd/distinfo
+++ b/clang-netbsd/distinfo
@@ -13,8 +13,6 @@ SHA1 (llvm-3.6.2.src.tar.xz) = 7a00257eb2bc9431e4c77c3a36b033072c54bc7e
RMD160 (llvm-3.6.2.src.tar.xz) = 521cbc5fe2925ea3c6e90c7a31f752a04045c972
Size (llvm-3.6.2.src.tar.xz) = 12802380 bytes
SHA1 (patch-lib_Basic_Targets.cpp) = 7b2e13a71f2b09c3f7336f21371637d3e39e4043
-SHA1 (patch-lib_Driver_ToolChains_NetBSD.cpp) = 83982b7fee74a199bcf99e1dbbe5b92a17514cd3
-SHA1 (patch-test_Driver_netbsd.c) = 03d935c4362391fbaee264e02a9c02f3233c6576
SHA1 (patch-test_Sema_128bitfloat.cpp) = cc11582dd9495b603a22ef73609ab04f65324da2
SHA1 (patch-tools_clang-format_CMakeLists.txt) = f119d2a94cbfb8c00a285d1aa7789ed26f8309cf
SHA1 (patch-unittests_ASTMatchers_Dynamic_RegistryTest.cpp) = 27a198a0efe237497f97e1903df5e8303e02745d
diff --git a/clang-netbsd/patches/patch-lib_Driver_ToolChains_NetBSD.cpp b/clang-netbsd/patches/patch-lib_Driver_ToolChains_NetBSD.cpp
deleted file mode 100644
index bb3a315494..0000000000
--- a/clang-netbsd/patches/patch-lib_Driver_ToolChains_NetBSD.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-$NetBSD$
-
---- lib/Driver/ToolChains/NetBSD.cpp.orig 2017-03-18 00:58:03.000000000 +0000
-+++ lib/Driver/ToolChains/NetBSD.cpp
-@@ -239,6 +239,7 @@ void netbsd::Linker::ConstructJob(Compil
- }
-
- Args.AddAllArgs(CmdArgs, options::OPT_L);
-+ getToolChain().AddFilePathLibArgs(Args, CmdArgs);
- Args.AddAllArgs(CmdArgs, options::OPT_T_Group);
- Args.AddAllArgs(CmdArgs, options::OPT_e);
- Args.AddAllArgs(CmdArgs, options::OPT_s);
-@@ -326,9 +327,12 @@ NetBSD::NetBSD(const Driver &D, const ll
- // doesn't work.
- // FIXME: It'd be nicer to test if this directory exists, but I'm not sure
- // what all logic is needed to emulate the '=' prefix here.
-+ auto AddPath = [&](StringRef Path) {
-+ getFilePaths().push_back(getDriver().SysRoot + Path.str());
-+ };
- switch (Triple.getArch()) {
- case llvm::Triple::x86:
-- getFilePaths().push_back("=/usr/lib/i386");
-+ AddPath("/usr/lib/i386");
- break;
- case llvm::Triple::arm:
- case llvm::Triple::armeb:
-@@ -337,35 +341,34 @@ NetBSD::NetBSD(const Driver &D, const ll
- switch (Triple.getEnvironment()) {
- case llvm::Triple::EABI:
- case llvm::Triple::GNUEABI:
-- getFilePaths().push_back("=/usr/lib/eabi");
-+ AddPath("/usr/lib/eabi");
- break;
- case llvm::Triple::EABIHF:
- case llvm::Triple::GNUEABIHF:
-- getFilePaths().push_back("=/usr/lib/eabihf");
-+ AddPath("/usr/lib/eabihf");
- break;
- default:
-- getFilePaths().push_back("=/usr/lib/oabi");
-+ AddPath("/usr/lib/oabi");
- break;
- }
- break;
- case llvm::Triple::mips64:
- case llvm::Triple::mips64el:
- if (tools::mips::hasMipsAbiArg(Args, "o32"))
-- getFilePaths().push_back("=/usr/lib/o32");
-+ AddPath("/usr/lib/o32");
- else if (tools::mips::hasMipsAbiArg(Args, "64"))
-- getFilePaths().push_back("=/usr/lib/64");
-+ AddPath("/usr/lib/64");
- break;
- case llvm::Triple::ppc:
-- getFilePaths().push_back("=/usr/lib/powerpc");
-+ AddPath("/usr/lib/powerpc");
- break;
- case llvm::Triple::sparc:
-- getFilePaths().push_back("=/usr/lib/sparc");
-+ AddPath("/usr/lib/sparc");
- break;
- default:
- break;
- }
--
-- getFilePaths().push_back("=/usr/lib");
-+ AddPath("/usr/lib");
- }
- }
-
diff --git a/clang-netbsd/patches/patch-test_Driver_netbsd.c b/clang-netbsd/patches/patch-test_Driver_netbsd.c
deleted file mode 100644
index b47e4ef8b7..0000000000
--- a/clang-netbsd/patches/patch-test_Driver_netbsd.c
+++ /dev/null
@@ -1,415 +0,0 @@
-$NetBSD$
-
---- test/Driver/netbsd.c.orig 2017-01-31 16:58:03.000000000 +0000
-+++ test/Driver/netbsd.c
-@@ -129,7 +129,7 @@
- // RUN: %clang -target x86_64--netbsd -pthread -dM -E %s \
- // RUN: | FileCheck -check-prefix=PTHREAD %s
-
--// STATIC: ld{{.*}}" "--eh-frame-hdr"
-+// STATIC: ld{{.*}}" "--sysroot=[[SYSROOT:[^"]+]]" "--eh-frame-hdr"
- // STATIC-NOT: "-pie"
- // STATIC-NOT: "-Bshareable"
- // STATIC: "-dynamic-linker" "/libexec/ld.elf_so"
-@@ -137,83 +137,88 @@
- // STATIC-NOT: "-Bshareable"
- // STATIC: "{{.*}}/usr/lib{{/|\\\\}}crt0.o"
- // STATIC: "{{.*}}/usr/lib{{/|\\\\}}crti.o" "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o"
-+// STATIC: "-L[[SYSROOT]]/usr/lib"
- // STATIC: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
-
--// SHARED: ld{{.*}}" "--eh-frame-hdr"
-+// SHARED: ld{{.*}}" "--sysroot=[[SYSROOT:[^"]+]]" "--eh-frame-hdr"
- // SHARED-NOT: "-pie"
- // SHARED-NOT: "-dynamic-linker"
- // SHARED-NOT: "{{.*}}/usr/lib{{/|\\\\}}crt0.o"
- // SHARED: "{{.*}}/usr/lib{{/|\\\\}}crti.o" "{{.*}}/usr/lib{{/|\\\\}}crtbeginS.o"
-+// SHARED: "-L[[SYSROOT]]/usr/lib"
- // SHARED: "{{.*}}/usr/lib{{/|\\\\}}crtendS.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
-
--// PIE: ld{{.*}}" "--eh-frame-hdr"
-+// PIE: ld{{.*}}" "--sysroot=[[SYSROOT:[^"]+]]" "--eh-frame-hdr"
- // PIE-NOT: "-Bshareable"
- // PIE "-pie" "-dynamic-linker" "/libexec/ld.elf_so"
- // PIE-NOT: "-Bshareable"
- // PIE: "{{.*}}/usr/lib{{/|\\\\}}crt0.o" "{{.*}}/usr/lib{{/|\\\\}}crti.o"
- // PIE: "{{.*}}/usr/lib{{/|\\\\}}crtbeginS.o"
-+// PIE: "-L[[SYSROOT]]/usr/lib"
- // PIE: "{{.*}}/usr/lib{{/|\\\\}}crtendS.o"
- // PIE: "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
-
- // X86_64: clang{{.*}}" "-cc1" "-triple" "x86_64--netbsd"
--// X86_64: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
-+// X86_64: ld{{.*}}" "--sysroot=[[SYSROOT:[^"]+]]" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
- // X86_64: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o" "{{.*}}/usr/lib{{/|\\\\}}crti.o"
--// X86_64: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
-+// X86_64: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "-L[[SYSROOT]]/usr/lib" "{{.*}}.o" "-lc"
- // X86_64: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
-
- // X86_64-7: clang{{.*}}" "-cc1" "-triple" "x86_64--netbsd7.0.0"
--// X86_64-7: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
-+// X86_64-7: ld{{.*}}" "--sysroot=[[SYSROOT:[^"]+]]" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
- // X86_64-7: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o" "{{.*}}/usr/lib{{/|\\\\}}crti.o"
--// X86_64-7: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
-+// X86_64-7: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "-L[[SYSROOT]]/usr/lib" "{{.*}}.o" "-lc"
- // X86_64-7: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
-
- // X86_64-6: clang{{.*}}" "-cc1" "-triple" "x86_64--netbsd6.0.0"
--// X86_64-6: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
-+// X86_64-6: ld{{.*}}" "--sysroot=[[SYSROOT:[^"]+]]" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
- // X86_64-6: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o" "{{.*}}/usr/lib{{/|\\\\}}crti.o"
--// X86_64-6: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
-+// X86_64-6: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "-L[[SYSROOT]]/usr/lib" "{{.*}}.o" "-lc"
- // X86_64-6: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
-
- // AARCH64: clang{{.*}}" "-cc1" "-triple" "aarch64--netbsd"
--// AARCH64: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
-+// AARCH64: ld{{.*}}" "--sysroot=[[SYSROOT:[^"]+]]" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
- // AARCH64: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o" "{{.*}}/usr/lib{{/|\\\\}}crti.o"
--// AARCH64: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
-+// AARCH64: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "-L[[SYSROOT]]/usr/lib" "{{.*}}.o" "-lc"
- // AARCH64: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
-
- // AARCH64-7: clang{{.*}}" "-cc1" "-triple" "aarch64--netbsd7.0.0"
--// AARCH64-7: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
-+// AARCH64-7: ld{{.*}}" "--sysroot=[[SYSROOT:[^"]+]]" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
- // AARCH64-7: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o" "{{.*}}/usr/lib{{/|\\\\}}crti.o"
--// AARCH64-7: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
-+// AARCH64-7: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "-L[[SYSROOT]]/usr/lib" "{{.*}}.o" "-lc"
- // AARCH64-7: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
-
- // AARCH64_BE: clang{{.*}}" "-cc1" "-triple" "aarch64_be--netbsd"
--// AARCH64_BE: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
-+// AARCH64_BE: ld{{.*}}" "--sysroot=[[SYSROOT:[^"]+]]" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
- // AARCH64_BE: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o" "{{.*}}/usr/lib{{/|\\\\}}crti.o"
--// AARCH64_BE: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
-+// AARCH64_BE: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "-L[[SYSROOT]]/usr/lib" "{{.*}}.o" "-lc"
- // AARCH64_BE: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
-
- // AARCH64_BE-7: clang{{.*}}" "-cc1" "-triple" "aarch64_be--netbsd7.0.0"
--// AARCH64_BE-7: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
-+// AARCH64_BE-7: ld{{.*}}" "--sysroot=[[SYSROOT:[^"]+]]" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
- // AARCH64_BE-7: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o" "{{.*}}/usr/lib{{/|\\\\}}crti.o"
--// AARCH64_BE-7: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
-+// AARCH64_BE-7: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "-L[[SYSROOT]]/usr/lib" "{{.*}}.o" "-lc"
- // AARCH64_BE-7: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
-
- // ARM: clang{{.*}}" "-cc1" "-triple" "armv5e--netbsd-eabi"
- // ARM: as{{.*}}" "-mcpu=arm926ej-s" "-o"
--// ARM: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
-+// ARM: ld{{.*}}" "--sysroot=[[SYSROOT:[^"]+]]" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
- // ARM: "-m" "armelf_nbsd_eabi"
- // ARM: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o"
- // ARM: "{{.*}}/usr/lib{{/|\\\\}}eabi{{/|\\\\}}crti.o"
--// ARM: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
-+// ARM: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o"
-+// ARM: "-L[[SYSROOT]]/usr/lib/eabi" "-L[[SYSROOT]]/usr/lib" "{{.*}}.o" "-lc"
- // ARM: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
-
- // ARMEB: clang{{.*}}" "-cc1" "-triple" "armebv5e--netbsd-eabi"
- // ARMEB: as{{.*}}" "-mcpu=arm926ej-s" "-o"
--// ARMEB: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
-+// ARMEB: ld{{.*}}" "--sysroot=[[SYSROOT:[^"]+]]" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
- // ARMEB-NOT: "--be8"
- // ARMEB: "-m" "armelfb_nbsd_eabi"
- // ARMEB: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o"
- // ARMEB: "{{.*}}/usr/lib{{/|\\\\}}eabi{{/|\\\\}}crti.o"
--// ARMEB: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
-+// ARMEB: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o"
-+// ARMEB: "-L[[SYSROOT]]/usr/lib/eabi" "-L[[SYSROOT]]/usr/lib" "{{.*}}.o" "-lc"
- // ARMEB: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
- // ARMV7EB: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
- // ARMV7EB: "--be8" "-m" "armelfb_nbsd_eabi"
-@@ -223,211 +228,238 @@
-
- // ARM-APCS: clang{{.*}}" "-cc1" "-triple" "armv4--netbsd"
- // ARM-APCS: as{{.*}}" "-mcpu=strongarm" "-o"
--// ARM-APCS: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
-+// ARM-APCS: ld{{.*}}" "--sysroot=[[SYSROOT:[^"]+]]" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
- // ARM-APCS: "-m" "armelf_nbsd"
- // ARM-APCS: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o"
- // ARM-APCS: "{{.*}}/usr/lib{{/|\\\\}}oabi{{/|\\\\}}crti.o"
--// ARM-APCS: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
-+// ARM-APCS: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o"
-+// ARM-APCS: "-L[[SYSROOT]]/usr/lib/oabi" "-L[[SYSROOT]]/usr/lib" "{{.*}}.o" "-lc"
- // ARM-APCS: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
-
- // ARM-HF: clang{{.*}}" "-cc1" "-triple" "armv5e--netbsd-eabihf"
- // ARM-HF: as{{.*}}" "-mcpu=arm926ej-s" "-o"
--// ARM-HF: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
-+// ARM-HF: ld{{.*}}" "--sysroot=[[SYSROOT:[^"]+]]" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
- // ARM-HF: "-m" "armelf_nbsd_eabihf"
- // ARM-HF: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o"
- // ARM-HF: "{{.*}}/usr/lib{{/|\\\\}}eabihf{{/|\\\\}}crti.o"
--// ARM-HF: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
-+// ARM-HF: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o"
-+// ARM-HF: "-L[[SYSROOT]]/usr/lib/eabihf" "-L[[SYSROOT]]/usr/lib" "{{.*}}.o" "-lc"
- // ARM-HF: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
-
- // THUMB: clang{{.*}}" "-cc1" "-triple" "armv5e--netbsd-eabi"
- // THUMB: as{{.*}}" "-mcpu=arm926ej-s" "-o"
--// THUMB: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
-+// THUMB: ld{{.*}}" "--sysroot=[[SYSROOT:[^"]+]]" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
- // THUMB: "-m" "armelf_nbsd_eabi"
- // THUMB: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o"
- // THUMB: "{{.*}}/usr/lib{{/|\\\\}}eabi{{/|\\\\}}crti.o"
--// THUMB: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
-+// THUMB: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o"
-+// THUMB: "-L[[SYSROOT]]/usr/lib/eabi" "-L[[SYSROOT]]/usr/lib" "{{.*}}.o" "-lc"
- // THUMB: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
-
- // THUMBEB: clang{{.*}}" "-cc1" "-triple" "armebv5e--netbsd-eabi"
- // THUMBEB: as{{.*}}" "-mcpu=arm926ej-s" "-o"
--// THUMBEB: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
-+// THUMBEB: ld{{.*}}" "--sysroot=[[SYSROOT:[^"]+]]" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
- // THUMBEB: "-m" "armelfb_nbsd_eabi"
- // THUMBEB: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o"
- // THUMBEB: "{{.*}}/usr/lib{{/|\\\\}}eabi{{/|\\\\}}crti.o"
--// THUMBEB: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
-+// THUMBEB: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o"
-+// THUMBEB: "-L[[SYSROOT]]/usr/lib/eabi" "-L[[SYSROOT]]/usr/lib" "{{.*}}.o" "-lc"
- // THUMBEB: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
-
- // ARM-7: clang{{.*}}" "-cc1" "-triple" "armv5e--netbsd7.0.0-eabi"
--// ARM-7: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
-+// ARM-7: ld{{.*}}" "--sysroot=[[SYSROOT:[^"]+]]" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
- // ARM-7: "-m" "armelf_nbsd_eabi"
- // ARM-7: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o"
- // ARM-7: "{{.*}}/usr/lib{{/|\\\\}}eabi{{/|\\\\}}crti.o"
--// ARM-7: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
-+// ARM-7: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o"
-+// ARM-7: "-L[[SYSROOT]]/usr/lib/eabi" "-L[[SYSROOT]]/usr/lib" "{{.*}}.o" "-lc"
- // ARM-7: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
-
- // ARM-6: clang{{.*}}" "-cc1" "-triple" "armv5e--netbsd6.0.0-eabi"
--// ARM-6: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
-+// ARM-6: ld{{.*}}" "--sysroot=[[SYSROOT:[^"]+]]" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
- // ARM-6: "-m" "armelf_nbsd_eabi"
- // ARM-6: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o"
- // ARM-6: "{{.*}}/usr/lib{{/|\\\\}}eabi{{/|\\\\}}crti.o"
--// ARM-6: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
-+// ARM-6: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o"
-+// ARM-6: "-L[[SYSROOT]]/usr/lib/eabi" "-L[[SYSROOT]]/usr/lib" "{{.*}}.o" "-lc"
- // ARM-6: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
-
- // SPARC: clang{{.*}}" "-cc1" "-triple" "sparc--netbsd"
- // SPARC: as{{.*}}" "-32" "-Av8" "-o"
--// SPARC: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
-+// SPARC: ld{{.*}}" "--sysroot=[[SYSROOT:[^"]+]]" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
- // SPARC: "-m" "elf32_sparc"
- // SPARC: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o"
- // SPARC: "{{.*}}/usr/lib{{/|\\\\}}sparc{{/|\\\\}}crti.o"
--// SPARC: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
-+// SPARC: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o"
-+// SPARC: "-L[[SYSROOT]]/usr/lib/sparc" "-L[[SYSROOT]]/usr/lib" "{{.*}}.o" "-lc"
- // SPARC: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
-
- // SPARC64: clang{{.*}}" "-cc1" "-triple" "sparc64--netbsd"
- // SPARC64: as{{.*}}" "-64" "-Av9" "-o"
--// SPARC64: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
-+// SPARC64: ld{{.*}}" "--sysroot=[[SYSROOT:[^"]+]]" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
- // SPARC64: "-m" "elf64_sparc"
- // SPARC64: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o" "{{.*}}/usr/lib{{/|\\\\}}crti.o"
--// SPARC64: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
-+// SPARC64: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o"
-+// SPARC64: "-L[[SYSROOT]]/usr/lib" "{{.*}}.o" "-lc"
- // SPARC64: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
-
- // POWERPC: clang{{.*}}" "-cc1" "-triple" "powerpc--netbsd"
--// POWERPC: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
-+// POWERPC: ld{{.*}}" "--sysroot=[[SYSROOT:[^"]+]]" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
- // POWERPC: "-m" "elf32ppc_nbsd"
- // POWERPC: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o"
- // POWERPC: "{{.*}}/usr/lib{{/|\\\\}}powerpc{{/|\\\\}}crti.o"
--// POWERPC: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
-+// POWERPC: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o"
-+// POWERPC: "-L[[SYSROOT]]/usr/lib/powerpc" "-L[[SYSROOT]]/usr/lib" "{{.*}}.o" "-lc"
- // POWERPC: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
-
- // POWERPC64: clang{{.*}}" "-cc1" "-triple" "powerpc64--netbsd"
--// POWERPC64: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
-+// POWERPC64: ld{{.*}}" "--sysroot=[[SYSROOT:[^"]+]]" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
- // POWERPC64: "-m" "elf64ppc"
- // POWERPC64: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o"
- // POWERPC64: "{{.*}}/usr/lib{{/|\\\\}}crti.o"
--// POWERPC64: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
-+// POWERPC64: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o"
-+// POWERPC64: "-L[[SYSROOT]]/usr/lib" "{{.*}}.o" "-lc"
- // POWERPC64: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
-
- // S-X86_64: clang{{.*}}" "-cc1" "-triple" "x86_64--netbsd"
--// S-X86_64: ld{{.*}}" "--eh-frame-hdr" "-Bstatic"
-+// S-X86_64: ld{{.*}}" "--sysroot=[[SYSROOT:[^"]+]]" "--eh-frame-hdr" "-Bstatic"
- // S-X86_64: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o" "{{.*}}/usr/lib{{/|\\\\}}crti.o"
--// S-X86_64: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
-+// S-X86_64: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o"
-+// S-X86_64: "-L[[SYSROOT]]/usr/lib" "{{.*}}.o" "-lc"
- // S-X86_64: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
-
- // S-X86_64-7: clang{{.*}}" "-cc1" "-triple" "x86_64--netbsd7.0.0"
--// S-X86_64-7: ld{{.*}}" "--eh-frame-hdr" "-Bstatic"
-+// S-X86_64-7: ld{{.*}}" "--sysroot=[[SYSROOT:[^"]+]]" "--eh-frame-hdr" "-Bstatic"
- // S-X86_64-7: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o" "{{.*}}/usr/lib{{/|\\\\}}crti.o"
--// S-X86_64-7: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
-+// S-X86_64-7: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o"
-+// S-X86_64-7: "-L[[SYSROOT]]/usr/lib" "{{.*}}.o" "-lc"
- // S-X86_64-7: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
-
- // S-X86_64-6: clang{{.*}}" "-cc1" "-triple" "x86_64--netbsd6.0.0"
--// S-X86_64-6: ld{{.*}}" "--eh-frame-hdr" "-Bstatic"
-+// S-X86_64-6: ld{{.*}}" "--sysroot=[[SYSROOT:[^"]+]]" "--eh-frame-hdr" "-Bstatic"
- // S-X86_64-6: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o" "{{.*}}/usr/lib{{/|\\\\}}crti.o"
--// S-X86_64-6: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
-+// S-X86_64-6: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o"
-+// S-X86_64-6: "-L[[SYSROOT]]/usr/lib" "{{.*}}.o" "-lc"
- // S-X86_64-6: "-lgcc_eh" "-lc" "-lgcc"
- // S-X86_64-6: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
-
- // S-AARCH64: clang{{.*}}" "-cc1" "-triple" "aarch64--netbsd"
--// S-AARCH64: ld{{.*}}" "--eh-frame-hdr" "-Bstatic"
-+// S-AARCH64: ld{{.*}}" "--sysroot=[[SYSROOT:[^"]+]]" "--eh-frame-hdr" "-Bstatic"
- // S-AARCH64: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o" "{{.*}}/usr/lib{{/|\\\\}}crti.o"
--// S-AARCH64: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
-+// S-AARCH64: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o"
-+// S-AARCH64: "-L[[SYSROOT]]/usr/lib" "{{.*}}.o" "-lc"
- // S-AARCH64: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
-
- // S-AARCH64-7: clang{{.*}}" "-cc1" "-triple" "aarch64--netbsd7.0.0"
--// S-AARCH64-7: ld{{.*}}" "--eh-frame-hdr" "-Bstatic"
-+// S-AARCH64-7: ld{{.*}}" "--sysroot=[[SYSROOT:[^"]+]]" "--eh-frame-hdr" "-Bstatic"
- // S-AARCH64-7: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o" "{{.*}}/usr/lib{{/|\\\\}}crti.o"
--// S-AARCH64-7: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
-+// S-AARCH64-7: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o"
-+// S-AARCH64-7: "-L[[SYSROOT]]/usr/lib" "{{.*}}.o" "-lc"
- // S-AARCH64-7: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
-
- // S-AARCH64_BE: clang{{.*}}" "-cc1" "-triple" "aarch64_be--netbsd"
--// S-AARCH64_BE: ld{{.*}}" "--eh-frame-hdr" "-Bstatic"
-+// S-AARCH64_BE: ld{{.*}}" "--sysroot=[[SYSROOT:[^"]+]]" "--eh-frame-hdr" "-Bstatic"
- // S-AARCH64_BE: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o" "{{.*}}/usr/lib{{/|\\\\}}crti.o"
--// S-AARCH64_BE: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
-+// S-AARCH64_BE: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o"
-+// S-AARCH64_BE: "-L[[SYSROOT]]/usr/lib" "{{.*}}.o" "-lc"
- // S-AARCH64_BE: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
-
- // S-AARCH64_BE-7: clang{{.*}}" "-cc1" "-triple" "aarch64_be--netbsd7.0.0"
--// S-AARCH64_BE-7: ld{{.*}}" "--eh-frame-hdr" "-Bstatic"
-+// S-AARCH64_BE-7: ld{{.*}}" "--sysroot=[[SYSROOT:[^"]+]]" "--eh-frame-hdr" "-Bstatic"
- // S-AARCH64_BE-7: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o" "{{.*}}/usr/lib{{/|\\\\}}crti.o"
--// S-AARCH64_BE-7: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
-+// S-AARCH64_BE-7: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o"
-+// S-AARCH64_BE-7: "-L[[SYSROOT]]/usr/lib" "{{.*}}.o" "-lc"
- // S-AARCH64_BE-7: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
-
- // S-ARM: clang{{.*}}" "-cc1" "-triple" "armv5e--netbsd-eabi"
--// S-ARM: ld{{.*}}" "--eh-frame-hdr" "-Bstatic"
-+// S-ARM: ld{{.*}}" "--sysroot=[[SYSROOT:[^"]+]]" "--eh-frame-hdr" "-Bstatic"
- // S-ARM: "-m" "armelf_nbsd_eabi"
- // S-ARM: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o"
- // S-ARM: "{{.*}}/usr/lib{{/|\\\\}}eabi{{/|\\\\}}crti.o"
--// S-ARM: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
-+// S-ARM: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o"
-+// S-ARM: "-L[[SYSROOT]]/usr/lib/eabi" "-L[[SYSROOT]]/usr/lib" "{{.*}}.o" "-lc"
- // S-ARM: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
-
- // S-ARMEB: clang{{.*}}" "-cc1" "-triple" "armebv5e--netbsd-eabi"
--// S-ARMEB: ld{{.*}}" "--eh-frame-hdr" "-Bstatic"
-+// S-ARMEB: ld{{.*}}" "--sysroot=[[SYSROOT:[^"]+]]" "--eh-frame-hdr" "-Bstatic"
- // S-ARMEB: "-m" "armelfb_nbsd_eabi"
- // S-ARMEB: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o"
- // S-ARMEB: "{{.*}}/usr/lib{{/|\\\\}}eabi{{/|\\\\}}crti.o"
--// S-ARMEB: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
-+// S-ARMEB: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o"
-+// S-ARMEB: "-L[[SYSROOT]]/usr/lib/eabi" "-L[[SYSROOT]]/usr/lib" "{{.*}}.o" "-lc"
- // S-ARMEB: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
-
- // S-ARM-7: clang{{.*}}" "-cc1" "-triple" "armv5e--netbsd7.0.0-eabi"
--// S-ARM-7: ld{{.*}}" "--eh-frame-hdr" "-Bstatic"
-+// S-ARM-7: ld{{.*}}" "--sysroot=[[SYSROOT:[^"]+]]" "--eh-frame-hdr" "-Bstatic"
- // S-ARM-7: "-m" "armelf_nbsd_eabi"
- // S-ARM-7: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o"
- // S-ARM-7: "{{.*}}/usr/lib{{/|\\\\}}eabi{{/|\\\\}}crti.o"
--// S-ARM-7: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
-+// S-ARM-7: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o"
-+// S-ARM-7: "-L[[SYSROOT]]/usr/lib/eabi" "-L[[SYSROOT]]/usr/lib" "{{.*}}.o" "-lc"
- // S-ARM-7: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
-
- // S-ARM-6: clang{{.*}}" "-cc1" "-triple" "armv5e--netbsd6.0.0-eabi"
--// S-ARM-6: ld{{.*}}" "--eh-frame-hdr" "-Bstatic"
-+// S-ARM-6: ld{{.*}}" "--sysroot=[[SYSROOT:[^"]+]]" "--eh-frame-hdr" "-Bstatic"
- // S-ARM-6: "-m" "armelf_nbsd_eabi"
- // S-ARM-6: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o"
- // S-ARM-6: "{{.*}}/usr/lib{{/|\\\\}}eabi{{/|\\\\}}crti.o"
--// S-ARM-6: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
-+// S-ARM-6: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o"
-+// S-ARM-6: "-L[[SYSROOT]]/usr/lib/eabi" "-L[[SYSROOT]]/usr/lib" "{{.*}}.o" "-lc"
- // S-ARM-6: "-lgcc_eh" "-lc" "-lgcc"
- // S-ARM-6: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
-
- // S-SPARC-6: clang{{.*}}" "-cc1" "-triple" "sparc--netbsd6.0.0"
--// S-SPARC-6: ld{{.*}}" "--eh-frame-hdr" "-Bstatic"
-+// S-SPARC-6: ld{{.*}}" "--sysroot=[[SYSROOT:[^"]+]]" "--eh-frame-hdr" "-Bstatic"
- // S-SPARC-6: "-m" "elf32_sparc"
- // S-SPARC-6: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o"
- // S-SPARC-6: "{{.*}}/usr/lib{{/|\\\\}}sparc{{/|\\\\}}crti.o"
--// S-SPARC-6: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
-+// S-SPARC-6: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o"
-+// S-SPARC-6: "-L[[SYSROOT]]/usr/lib/sparc" "-L[[SYSROOT]]/usr/lib" "{{.*}}.o" "-lc"
- // S-SPARC-6: "-lgcc_eh" "-lc" "-lgcc"
- // S-SPARC-6: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
-
- // S-SPARC-7: clang{{.*}}" "-cc1" "-triple" "sparc--netbsd7.0.0"
--// S-SPARC-7: ld{{.*}}" "--eh-frame-hdr" "-Bstatic"
-+// S-SPARC-7: ld{{.*}}" "--sysroot=[[SYSROOT:[^"]+]]" "--eh-frame-hdr" "-Bstatic"
- // S-SPARC-7: "-m" "elf32_sparc"
- // S-SPARC-7: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o"
- // S-SPARC-7: "{{.*}}/usr/lib{{/|\\\\}}sparc{{/|\\\\}}crti.o"
--// S-SPARC-7: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
-+// S-SPARC-7: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o"
-+// S-SPARC-7: "-L[[SYSROOT]]/usr/lib/sparc" "-L[[SYSROOT]]/usr/lib" "{{.*}}.o" "-lc"
- // S-SPARC-7: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
-
- // S-SPARC64-6: clang{{.*}}" "-cc1" "-triple" "sparc64--netbsd6.0.0"
--// S-SPARC64-6: ld{{.*}}" "--eh-frame-hdr" "-Bstatic"
-+// S-SPARC64-6: ld{{.*}}" "--sysroot=[[SYSROOT:[^"]+]]" "--eh-frame-hdr" "-Bstatic"
- // S-SPARC64-6: "-m" "elf64_sparc"
- // S-SPARC64-6: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o" "{{.*}}/usr/lib{{/|\\\\}}crti.o"
--// S-SPARC64-6: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
-+// S-SPARC64-6: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o"
-+// S-SPARC64-6: "-L[[SYSROOT]]/usr/lib" "{{.*}}.o" "-lc"
- // S-SPARC64-6: "-lgcc_eh" "-lc" "-lgcc"
- // S-SPARC64-6: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
-
- // S-SPARC64-7: clang{{.*}}" "-cc1" "-triple" "sparc64--netbsd7.0.0"
--// S-SPARC64-7: ld{{.*}}" "--eh-frame-hdr" "-Bstatic"
-+// S-SPARC64-7: ld{{.*}}" "--sysroot=[[SYSROOT:[^"]+]]" "--eh-frame-hdr" "-Bstatic"
- // S-SPARC64-7: "-m" "elf64_sparc"
- // S-SPARC64-7: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o" "{{.*}}/usr/lib{{/|\\\\}}crti.o"
--// S-SPARC64-7: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
-+// S-SPARC64-7: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o"
-+// S-SPARC64-7: "-L[[SYSROOT]]/usr/lib" "{{.*}}.o" "-lc"
- // S-SPARC64-7: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
-
- // S-POWERPC: clang{{.*}}" "-cc1" "-triple" "powerpc--netbsd"
--// S-POWERPC: ld{{.*}}" "--eh-frame-hdr" "-Bstatic"
-+// S-POWERPC: ld{{.*}}" "--sysroot=[[SYSROOT:[^"]+]]" "--eh-frame-hdr" "-Bstatic"
- // S-POWERPC: "-m" "elf32ppc_nbsd"
- // S-POWERPC: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o"
- // S-POWERPC: "{{.*}}/usr/lib{{/|\\\\}}powerpc{{/|\\\\}}crti.o"
--// S-POWERPC: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
-+// S-POWERPC: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o"
-+// S-POWERPC: "-L[[SYSROOT]]/usr/lib/powerpc" "-L[[SYSROOT]]/usr/lib" "{{.*}}.o" "-lc"
- // S-POWERPC: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
-
- // S-POWERPC64: clang{{.*}}" "-cc1" "-triple" "powerpc64--netbsd"
--// S-POWERPC64: ld{{.*}}" "--eh-frame-hdr" "-Bstatic"
-+// S-POWERPC64: ld{{.*}}" "--sysroot=[[SYSROOT:[^"]+]]" "--eh-frame-hdr" "-Bstatic"
- // S-POWERPC64: "-m" "elf64ppc"
- // S-POWERPC64: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o"
- // S-POWERPC64: "{{.*}}/usr/lib{{/|\\\\}}crti.o"
--// S-POWERPC64: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc"
-+// S-POWERPC64: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o"
-+// S-POWERPC64: "-L[[SYSROOT]]/usr/lib" "{{.*}}.o" "-lc"
- // S-POWERPC64: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
-
- // PTHREAD-NOT: _POSIX_THREADS
diff --git a/llvm-netbsd/Makefile b/llvm-netbsd/Makefile
index 307206b23b..32c133d4e9 100644
--- a/llvm-netbsd/Makefile
+++ b/llvm-netbsd/Makefile
@@ -1,24 +1,8 @@
# $NetBSD: Makefile.common,v 1.7 2015/07/20 05:49:53 adam Exp $
-#
-# when updating this, please also update:
-# devel/include-what-you-use
-# devel/lldb
-# devel/polly
-# lang/clang
-# lang/clang-static-analyzer
-# lang/libLLVM
-# lang/libunwind
-#
-# Always update all */buildlink3.mk to require the latest stable release
-# version in BUILDLINK_API_DEPENDS, as there is no backwards compatibility
-#
-PKGNAME= llvm-5.0.0
-CATEGORIES= lang devel
+.include "Makefile.common"
-SVN_REPOSITORIES= llvm
-SVN_REPO.llvm= http://llvm.org/svn/llvm-project/llvm/trunk
-SVN_REVISION.llvm= 304308
+PKGNAME= llvm-${LLVM_VERSION}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://llvm.org/
@@ -30,7 +14,6 @@ USE_CMAKE= yes
GCC_REQD+= 4.8
PYTHON_FOR_BUILD_ONLY= yes
-WRKSRC= ${WRKDIR}/${PKGBASE}
CONFIGURE_DIRS= ${WRKDIR}/build
CMAKE_ARG_PATH= ${WRKSRC}
@@ -44,27 +27,6 @@ CMAKE_ARGS+= -DLLVM_INSTALL_UTILS=ON
CMAKE_ARGS.Darwin+= -DCMAKE_LIBTOOL=/usr/bin/libtool
-CHECK_PORTABILITY_SKIP= utils/buildit/build_llvm
-
-# XXX perl is not added as a tool as it does not seem to be required
-REPLACE_PERL+= utils/*.pl
-REPLACE_PERL+= utils/codegen-diff
-REPLACE_PERL+= utils/llvm-native-gxx
-
-REPLACE_PYTHON+= *.py
-REPLACE_PYTHON+= */*.py
-REPLACE_PYTHON+= */*/*.py
-REPLACE_PYTHON+= */*/*/*.py
-REPLACE_PYTHON+= */*/*/*/*.py
-REPLACE_PYTHON+= utils/Misc/zkill
-REPLACE_PYTHON+= utils/bisect
-REPLACE_PYTHON+= utils/clang-parse-diagnostics-file
-REPLACE_PYTHON+= utils/git/find-rev
-REPLACE_PYTHON+= utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest
-REPLACE_PYTHON+= utils/llvm-build/llvm-build
-REPLACE_PYTHON+= utils/llvm-compilers-check
-REPLACE_PYTHON+= utils/llvm-lit/llvm-lit.in
-
TEST_TARGET= check
TEST_ENV+= LD_LIBRARY_PATH=${WRKDIR}/build/lib
diff --git a/llvm-netbsd/Makefile.common b/llvm-netbsd/Makefile.common
new file mode 100644
index 0000000000..13b1c744f7
--- /dev/null
+++ b/llvm-netbsd/Makefile.common
@@ -0,0 +1,47 @@
+# $NetBSD: Makefile.common,v 1.7 2015/07/20 05:49:53 adam Exp $
+#
+# when updating this, please also update:
+# devel/include-what-you-use
+# devel/lldb
+# devel/polly
+# lang/clang
+# lang/clang-static-analyzer
+# lang/libLLVM
+# lang/libunwind
+#
+# Always update all */buildlink3.mk to require the latest stable release
+# version in BUILDLINK_API_DEPENDS, as there is no backwards compatibility
+#
+
+LLVM_VERSION= 5.0.0
+
+CATEGORIES= lang devel
+
+SVN_REPOSITORIES= llvm
+SVN_REPO.llvm= http://llvm.org/svn/llvm-project/llvm/trunk
+SVN_REVISION.llvm= 304308
+
+WRKSRC= ${WRKDIR}/llvm
+
+CHECK_PORTABILITY_SKIP= utils/buildit/build_llvm
+
+# XXX perl is not added as a tool as it does not seem to be required
+REPLACE_PERL+= utils/*.pl
+REPLACE_PERL+= utils/codegen-diff
+REPLACE_PERL+= utils/llvm-native-gxx
+
+REPLACE_PYTHON+= *.py
+REPLACE_PYTHON+= */*.py
+REPLACE_PYTHON+= */*/*.py
+REPLACE_PYTHON+= */*/*/*.py
+REPLACE_PYTHON+= */*/*/*/*.py
+REPLACE_PYTHON+= utils/Misc/zkill
+REPLACE_PYTHON+= utils/bisect
+REPLACE_PYTHON+= utils/clang-parse-diagnostics-file
+REPLACE_PYTHON+= utils/git/find-rev
+REPLACE_PYTHON+= utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest
+REPLACE_PYTHON+= utils/llvm-build/llvm-build
+REPLACE_PYTHON+= utils/llvm-compilers-check
+REPLACE_PYTHON+= utils/llvm-lit/llvm-lit.in
+
+.include "../../wip/mk/svn-package.mk"
diff --git a/py-llvm-lit-netbsd/DESCR b/py-llvm-lit-netbsd/DESCR
new file mode 100644
index 0000000000..6257455c40
--- /dev/null
+++ b/py-llvm-lit-netbsd/DESCR
@@ -0,0 +1,7 @@
+lit is a portable tool for executing LLVM and Clang style test suites,
+summarizing their results, and providing indication of failures. lit is
+designed to be a lightweight testing tool with as simple a user interface as
+possible.
+
+lit should be run with one or more tests to run specified on the command line.
+Tests can be either individual test files or directories to search for tests.
diff --git a/py-llvm-lit-netbsd/Makefile b/py-llvm-lit-netbsd/Makefile
new file mode 100644
index 0000000000..716ff5e776
--- /dev/null
+++ b/py-llvm-lit-netbsd/Makefile
@@ -0,0 +1,23 @@
+# $NetBSD: Makefile.common,v 1.7 2015/07/20 05:49:53 adam Exp $
+
+.include "../../wip/llvm-netbsd/Makefile.common"
+
+PKGNAME= ${PYPKGPREFIX}-llvm-lit-${LLVM_VERSION}
+CATEGORIES+= python
+
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= http://llvm.org/docs/CommandGuide/lit.html
+COMMENT= LLVM Integrated Tester
+LICENSE= modified-bsd
+
+PYSETUPSUBDIR= utils/lit
+
+INSTALLATION_DIRS= bin
+
+post-install:
+ ${INSTALL_SCRIPT} ${WRKSRC}/utils/lit/lit.py \
+ ${DESTDIR}${PREFIX}/bin/llvm-lit-${PYVERSSUFFIX}
+
+.include "../../lang/python/distutils.mk"
+.include "../../lang/python/application.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/py-llvm-lit-netbsd/PLIST b/py-llvm-lit-netbsd/PLIST
new file mode 100644
index 0000000000..7a4d851ebb
--- /dev/null
+++ b/py-llvm-lit-netbsd/PLIST
@@ -0,0 +1,63 @@
+@comment $NetBSD$
+bin/lit
+bin/llvm-lit-${PYVERSSUFFIX}
+${PYSITELIB}/lit-0.6.0.dev0${EGG_FILE}/PKG-INFO
+${PYSITELIB}/lit-0.6.0.dev0${EGG_FILE}/SOURCES.txt
+${PYSITELIB}/lit-0.6.0.dev0${EGG_FILE}/dependency_links.txt
+${PYSITELIB}/lit-0.6.0.dev0${EGG_FILE}/entry_points.txt
+${PYSITELIB}/lit-0.6.0.dev0${EGG_FILE}/not-zip-safe
+${PYSITELIB}/lit-0.6.0.dev0${EGG_FILE}/top_level.txt
+${PYSITELIB}/lit/BooleanExpression.py
+${PYSITELIB}/lit/BooleanExpression.pyc
+${PYSITELIB}/lit/BooleanExpression.pyo
+${PYSITELIB}/lit/LitConfig.py
+${PYSITELIB}/lit/LitConfig.pyc
+${PYSITELIB}/lit/LitConfig.pyo
+${PYSITELIB}/lit/LitTestCase.py
+${PYSITELIB}/lit/LitTestCase.pyc
+${PYSITELIB}/lit/LitTestCase.pyo
+${PYSITELIB}/lit/ProgressBar.py
+${PYSITELIB}/lit/ProgressBar.pyc
+${PYSITELIB}/lit/ProgressBar.pyo
+${PYSITELIB}/lit/ShCommands.py
+${PYSITELIB}/lit/ShCommands.pyc
+${PYSITELIB}/lit/ShCommands.pyo
+${PYSITELIB}/lit/ShUtil.py
+${PYSITELIB}/lit/ShUtil.pyc
+${PYSITELIB}/lit/ShUtil.pyo
+${PYSITELIB}/lit/Test.py
+${PYSITELIB}/lit/Test.pyc
+${PYSITELIB}/lit/Test.pyo
+${PYSITELIB}/lit/TestRunner.py
+${PYSITELIB}/lit/TestRunner.pyc
+${PYSITELIB}/lit/TestRunner.pyo
+${PYSITELIB}/lit/TestingConfig.py
+${PYSITELIB}/lit/TestingConfig.pyc
+${PYSITELIB}/lit/TestingConfig.pyo
+${PYSITELIB}/lit/__init__.py
+${PYSITELIB}/lit/__init__.pyc
+${PYSITELIB}/lit/__init__.pyo
+${PYSITELIB}/lit/discovery.py
+${PYSITELIB}/lit/discovery.pyc
+${PYSITELIB}/lit/discovery.pyo
+${PYSITELIB}/lit/formats/__init__.py
+${PYSITELIB}/lit/formats/__init__.pyc
+${PYSITELIB}/lit/formats/__init__.pyo
+${PYSITELIB}/lit/formats/base.py
+${PYSITELIB}/lit/formats/base.pyc
+${PYSITELIB}/lit/formats/base.pyo
+${PYSITELIB}/lit/formats/googletest.py
+${PYSITELIB}/lit/formats/googletest.pyc
+${PYSITELIB}/lit/formats/googletest.pyo
+${PYSITELIB}/lit/formats/shtest.py
+${PYSITELIB}/lit/formats/shtest.pyc
+${PYSITELIB}/lit/formats/shtest.pyo
+${PYSITELIB}/lit/main.py
+${PYSITELIB}/lit/main.pyc
+${PYSITELIB}/lit/main.pyo
+${PYSITELIB}/lit/run.py
+${PYSITELIB}/lit/run.pyc
+${PYSITELIB}/lit/run.pyo
+${PYSITELIB}/lit/util.py
+${PYSITELIB}/lit/util.pyc
+${PYSITELIB}/lit/util.pyo
diff --git a/py-llvm-lit-netbsd/distinfo b/py-llvm-lit-netbsd/distinfo
new file mode 100644
index 0000000000..7931384fd5
--- /dev/null
+++ b/py-llvm-lit-netbsd/distinfo
@@ -0,0 +1,14 @@
+$NetBSD: distinfo,v 1.35 2015/09/11 01:21:57 tnn Exp $
+
+SHA1 (cfe-3.6.2.src.tar.xz) = 7ba809c9c17819a16b668640a642ed134d7052f0
+RMD160 (cfe-3.6.2.src.tar.xz) = 10d913b4d5317f8c2520e5fc6117df30937317a8
+Size (cfe-3.6.2.src.tar.xz) = 8617576 bytes
+SHA1 (compiler-rt-3.6.2.src.tar.xz) = c6c52d2923a60f1a2ca2f22fea1770fd2e25728d
+RMD160 (compiler-rt-3.6.2.src.tar.xz) = 9b68a32d49d4bef4603d550934192f39fea42895
+Size (compiler-rt-3.6.2.src.tar.xz) = 1128080 bytes
+SHA1 (libcxx-3.6.2.src.tar.xz) = 6c5aee9f05ecf17d1e3ecb1add34a33a5a904469
+RMD160 (libcxx-3.6.2.src.tar.xz) = 42b8832d01d4e6b553babc93cb5dbd4ce2bb1931
+Size (libcxx-3.6.2.src.tar.xz) = 944020 bytes
+SHA1 (llvm-3.6.2.src.tar.xz) = 7a00257eb2bc9431e4c77c3a36b033072c54bc7e
+RMD160 (llvm-3.6.2.src.tar.xz) = 521cbc5fe2925ea3c6e90c7a31f752a04045c972
+Size (llvm-3.6.2.src.tar.xz) = 12802380 bytes
Home |
Main Index |
Thread Index |
Old Index