Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7908fb9583
|
||
|
|
95aa7c205c
|
||
|
|
bd0cc3656f
|
+15
-8
@@ -17,22 +17,29 @@ func (t Toolchain) NewViaGit(
|
||||
url, rev string,
|
||||
checksum pkg.Checksum,
|
||||
) pkg.Artifact {
|
||||
return t.New(strings.TrimSuffix(
|
||||
return t.NewPackage(strings.TrimSuffix(
|
||||
path.Base(url),
|
||||
".git",
|
||||
)+"-src-"+path.Base(rev), THostNet, t.Append(nil,
|
||||
_nssCACert,
|
||||
_git,
|
||||
), &checksum, nil, `
|
||||
)+"-src", path.Base(rev), nil, &PackageAttr{
|
||||
KnownChecksum: &checksum,
|
||||
|
||||
Flag: THostNet,
|
||||
Paths: []pkg.ExecPath{resolvconf()},
|
||||
}, &GenericHelper{
|
||||
Build: `
|
||||
git \
|
||||
-c advice.detachedHead=false \
|
||||
clone \
|
||||
--depth=1 \
|
||||
--revision=`+rev+` \
|
||||
--revision=` + rev + ` \
|
||||
--shallow-submodules \
|
||||
--recurse-submodules \
|
||||
`+url+` \
|
||||
` + url + ` \
|
||||
/work
|
||||
rm -rf /work/.git
|
||||
`, resolvconf())
|
||||
`,
|
||||
},
|
||||
_nssCACert,
|
||||
_git,
|
||||
)
|
||||
}
|
||||
|
||||
+15
-1
@@ -83,9 +83,11 @@ func init() {
|
||||
{"LIBCXX_ENABLE_STATIC_ABI_LIBRARY", "OFF"},
|
||||
{"LIBCXX_HAS_MUSL_LIBC", "ON"},
|
||||
{"LIBCXX_HARDENING_MODE", "fast"},
|
||||
{"LIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY", "ON"},
|
||||
{"LIBCXXABI_USE_LLVM_UNWINDER", "ON"},
|
||||
{"LIBCXXABI_ENABLE_STATIC_UNWINDER", "OFF"},
|
||||
{"LIBCXXABI_ENABLE_STATIC_UNWINDER", "ON"},
|
||||
{"LIBCXXABI_USE_COMPILER_RT", "ON"},
|
||||
{"LIBCXXABI_STATICALLY_LINK_UNWINDER_IN_STATIC_LIBRARY", "ON"},
|
||||
{"LLVM_INSTALL_BINUTILS_SYMLINKS", "ON"},
|
||||
{"LLVM_INSTALL_UTILS", "ON"},
|
||||
{"LLVM_BUILD_LLVM_DYLIB", "ON"},
|
||||
@@ -138,6 +140,10 @@ func init() {
|
||||
"CodeGen/PowerPC/ppc-tmmintrin.c",
|
||||
"CodeGen/PowerPC/ppc-smmintrin.c",
|
||||
"CodeGenCUDA/amdgpu-alias-undef-symbols.cu",
|
||||
// clang: deadlocks with LIBCXXABI_ENABLE_STATIC_UNWINDER
|
||||
"global-value-regex",
|
||||
"global-hex-value-regex",
|
||||
"check-globals",
|
||||
// cxx: fails on musl
|
||||
"close.dont-get-rid-of-buffer",
|
||||
"re/re.traits",
|
||||
@@ -187,6 +193,10 @@ func init() {
|
||||
"tr",
|
||||
"awk",
|
||||
},
|
||||
|
||||
ScriptEarly: `
|
||||
rm -f /system/bin/clang++.cfg
|
||||
`,
|
||||
}, &CMakeHelper{
|
||||
Append: []string{"llvm"},
|
||||
|
||||
@@ -196,6 +206,10 @@ ln -s ld.lld /work/system/bin/ld
|
||||
ln -s clang /work/system/bin/cc
|
||||
ln -s clang /work/system/bin/cpp
|
||||
ln -s clang++ /work/system/bin/c++
|
||||
cat << EOF > /work/system/bin/clang++.cfg
|
||||
-static-libstdc++
|
||||
-Wl,--exclude-libs,libunwind.a:libc++.a:libc++experimental.a:libc++abi.a
|
||||
EOF
|
||||
`,
|
||||
|
||||
// LLVM_LINK_LLVM_DYLIB causes llvm test suite to leak system
|
||||
|
||||
@@ -82,7 +82,7 @@ package spirv-llvm-translator {
|
||||
};
|
||||
|
||||
// litArgs emits shell syntax
|
||||
early = "\nexport LIT_OPTS=" + litArgs {
|
||||
early = "rm -f /system/bin/clang++.cfg\nexport LIT_OPTS=" + litArgs {
|
||||
verbose = true;
|
||||
|
||||
skipChecks = arch {
|
||||
|
||||
@@ -363,9 +363,14 @@ function apply {
|
||||
buf.WriteString("'\n")
|
||||
}
|
||||
}
|
||||
return t.New(name+"-src", 0, t.Append(nil,
|
||||
|
||||
return t.NewPackage(name+"-src", Unversioned, nil, &PackageAttr{
|
||||
Paths: paths,
|
||||
}, &GenericHelper{
|
||||
Build: buf.String(),
|
||||
},
|
||||
_patch,
|
||||
), nil, nil, buf.String(), paths...)
|
||||
)
|
||||
}
|
||||
|
||||
// helperInPlace is a special directory value for omitting the cd statement.
|
||||
|
||||
Reference in New Issue
Block a user