mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-16 12:45:18 +03:00
122 lines
2.8 KiB
Diff
122 lines
2.8 KiB
Diff
--- a/build/toolchain/linux/BUILD.gn
|
|
+++ b/build/toolchain/linux/BUILD.gn
|
|
@@ -50,15 +50,14 @@
|
|
}
|
|
|
|
gcc_toolchain("clang_arm") {
|
|
- prefix = rebased_clang_dir
|
|
- cc = "${compiler_prefix}${prefix}/clang"
|
|
- cxx = "${compiler_prefix}${prefix}/clang++"
|
|
+ cc = "clang"
|
|
+ cxx = "clang++"
|
|
|
|
- readelf = "${prefix}/llvm-readelf"
|
|
- nm = "${prefix}/llvm-nm"
|
|
- ar = "${prefix}/llvm-ar"
|
|
+ readelf = "llvm-readelf"
|
|
+ nm = "llvm-nm"
|
|
+ ar = "llvm-ar"
|
|
ld = cxx
|
|
- llvm_objcopy = "${prefix}/llvm-objcopy"
|
|
+ llvm_objcopy = "llvm-objcopy"
|
|
|
|
toolchain_cpu = "arm"
|
|
toolchain_os = "linux"
|
|
@@ -86,15 +85,14 @@
|
|
}
|
|
|
|
gcc_toolchain("clang_arm64") {
|
|
- prefix = rebased_clang_dir
|
|
- cc = "${compiler_prefix}${prefix}/clang"
|
|
- cxx = "${compiler_prefix}${prefix}/clang++"
|
|
+ cc = "clang"
|
|
+ cxx = "clang++"
|
|
|
|
readelf = "readelf"
|
|
- nm = "${prefix}/llvm-nm"
|
|
- ar = "${prefix}/llvm-ar"
|
|
+ nm = "llvm-nm"
|
|
+ ar = "llvm-ar"
|
|
ld = cxx
|
|
- llvm_objcopy = "${prefix}/llvm-objcopy"
|
|
+ llvm_objcopy = "llvm-objcopy"
|
|
|
|
toolchain_cpu = "arm64"
|
|
toolchain_os = "linux"
|
|
@@ -102,15 +100,14 @@
|
|
}
|
|
|
|
gcc_toolchain("clang_x86") {
|
|
- prefix = rebased_clang_dir
|
|
- cc = "${compiler_prefix}${prefix}/clang"
|
|
- cxx = "${compiler_prefix}${prefix}/clang++"
|
|
+ cc = "clang"
|
|
+ cxx = "clang++"
|
|
|
|
- readelf = "${prefix}/llvm-readelf"
|
|
- nm = "${prefix}/llvm-nm"
|
|
- ar = "${prefix}/llvm-ar"
|
|
- ld = cxx
|
|
- llvm_objcopy = "${prefix}/llvm-objcopy"
|
|
+ readelf = "llvm-readelf"
|
|
+ nm = "llvm-nm"
|
|
+ ar = "llvm-ar"
|
|
+ ld = "ld.lld"
|
|
+ llvm_objcopy = "llvm-objcopy"
|
|
|
|
toolchain_cpu = "x86"
|
|
toolchain_os = "linux"
|
|
@@ -134,15 +131,14 @@
|
|
}
|
|
|
|
gcc_toolchain("clang_x64") {
|
|
- prefix = rebased_clang_dir
|
|
- cc = "${compiler_prefix}${prefix}/clang"
|
|
- cxx = "${compiler_prefix}${prefix}/clang++"
|
|
+ cc = "clang"
|
|
+ cxx = "clang++"
|
|
|
|
- readelf = "${prefix}/llvm-readelf"
|
|
- nm = "${prefix}/llvm-nm"
|
|
- ar = "${prefix}/llvm-ar"
|
|
+ readelf = "llvm-readelf"
|
|
+ nm = "llvm-nm"
|
|
+ ar = "llvm-ar"
|
|
ld = cxx
|
|
- llvm_objcopy = "${prefix}/llvm-objcopy"
|
|
+ llvm_objcopy = "llvm-objcopy"
|
|
|
|
toolchain_cpu = "x64"
|
|
toolchain_os = "linux"
|
|
@@ -222,15 +218,14 @@
|
|
}
|
|
|
|
gcc_toolchain("clang_riscv64") {
|
|
- prefix = rebased_clang_dir
|
|
- cc = "${compiler_prefix}${prefix}/clang"
|
|
- cxx = "${compiler_prefix}${prefix}/clang++"
|
|
+ cc = "clang"
|
|
+ cxx = "clang++"
|
|
|
|
readelf = "readelf"
|
|
- nm = "${prefix}/llvm-nm"
|
|
- ar = "${prefix}/llvm-ar"
|
|
+ nm = "llvm-nm"
|
|
+ ar = "llvm-ar"
|
|
ld = cxx
|
|
- llvm_objcopy = "${prefix}/llvm-objcopy"
|
|
+ llvm_objcopy = "llvm-objcopy"
|
|
|
|
toolchain_cpu = "riscv64"
|
|
toolchain_os = "linux"
|
|
--- a/build/config/linux/BUILD.gn
|
|
+++ b/build/config/linux/BUILD.gn
|
|
@@ -11,6 +11,8 @@
|
|
if (is_clang) {
|
|
# Don't allow visible symbols from libc++ to be re-exported.
|
|
ldflags += [ "-Wl,--exclude-libs=libc++.a" ]
|
|
+ # use lld
|
|
+ ldflags += [ "-fuse-ld=lld" ]
|
|
}
|
|
|
|
if (sysroot != "") {
|