diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2020-06-04 23:29:54 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2020-06-05 12:23:19 +0200 |
| commit | 48b44e1ce06df8ab8a8571866e2cc658012103a2 (patch) | |
| tree | b1d2b70d05326fa27d435b156457f4a74c0bcb2c /sys | |
| parent | 2b2857bd2191458a131689502224abfe9cdd7a4a (diff) | |
.golangci.yml: reenable dupl checker
At some point it was enabled, but then somehow got disabled.
Re-enable and fix some regressions.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/targets/targets.go | 57 |
1 files changed, 23 insertions, 34 deletions
diff --git a/sys/targets/targets.go b/sys/targets/targets.go index 47b3d8a97..b33dd5609 100644 --- a/sys/targets/targets.go +++ b/sys/targets/targets.go @@ -264,23 +264,7 @@ var List = map[string]map[string]*Target{ KernelHeaderArch: "x64", CCompiler: sourceDirVar + "/prebuilt/third_party/clang/linux-x64/bin/clang", Objdump: sourceDirVar + "/prebuilt/third_party/clang/linux-x64/bin/llvm-objdump", - CFlags: []string{ - "-Wno-deprecated", - "--target=x86_64-fuchsia", - "-ldriver", - "-lfdio", - "-lzircon", - "--sysroot", sourceDirVar + "/out/x64/zircon_toolchain/obj/zircon/public/sysroot/sysroot", - "-I", sourceDirVar + "/zircon/system/ulib/fdio/include", - "-I", sourceDirVar + "/zircon/system/ulib/fidl/include", - "-I", sourceDirVar + "/src/lib/ddk/include", - "-I", sourceDirVar + "/out/x64/fidling/gen/sdk/fidl/fuchsia.device", - "-I", sourceDirVar + "/out/x64/fidling/gen/sdk/fidl/fuchsia.device.manager", - "-I", sourceDirVar + "/out/x64/fidling/gen/sdk/fidl/fuchsia.hardware.nand", - "-I", sourceDirVar + "/out/x64/fidling/gen/sdk/fidl/fuchsia.hardware.usb.peripheral", - "-I", sourceDirVar + "/out/x64/fidling/gen/zircon/vdso/zx", - "-L", sourceDirVar + "/out/x64/x64-shared", - }, + CFlags: fuchsiaCFlags("x64", "x86_64"), }, "arm64": { PtrSize: 8, @@ -288,23 +272,7 @@ var List = map[string]map[string]*Target{ KernelHeaderArch: "arm64", CCompiler: sourceDirVar + "/prebuilt/third_party/clang/linux-x64/bin/clang", Objdump: sourceDirVar + "/prebuilt/third_party/clang/linux-x64/bin/llvm-objdump", - CFlags: []string{ - "-Wno-deprecated", - "--target=aarch64-fuchsia", - "-ldriver", - "-lfdio", - "-lzircon", - "--sysroot", sourceDirVar + "/out/arm64/zircon_toolchain/obj/zircon/public/sysroot/sysroot", - "-I", sourceDirVar + "/zircon/system/ulib/fdio/include", - "-I", sourceDirVar + "/zircon/system/ulib/fidl/include", - "-I", sourceDirVar + "/src/lib/ddk/include", - "-I", sourceDirVar + "/out/arm64/fidling/gen/sdk/fidl/fuchsia.device", - "-I", sourceDirVar + "/out/arm64/fidling/gen/sdk/fidl/fuchsia.device.manager", - "-I", sourceDirVar + "/out/arm64/fidling/gen/sdk/fidl/fuchsia.hardware.nand", - "-I", sourceDirVar + "/out/arm64/fidling/gen/sdk/fidl/fuchsia.hardware.usb.peripheral", - "-I", sourceDirVar + "/out/arm64/fidling/gen/zircon/vdso/zx", - "-L", sourceDirVar + "/out/arm64/arm64-shared", - }, + CFlags: fuchsiaCFlags("arm64", "aarch64"), }, }, "windows": { @@ -419,6 +387,27 @@ var ( } ) +func fuchsiaCFlags(arch, clangArch string) []string { + out := sourceDirVar + "/out/" + arch + return []string{ + "-Wno-deprecated", + "--target", clangArch + "-fuchsia", + "-ldriver", + "-lfdio", + "-lzircon", + "--sysroot", out + "/zircon_toolchain/obj/zircon/public/sysroot/sysroot", + "-I", sourceDirVar + "/zircon/system/ulib/fdio/include", + "-I", sourceDirVar + "/zircon/system/ulib/fidl/include", + "-I", sourceDirVar + "/src/lib/ddk/include", + "-I", out + "/fidling/gen/sdk/fidl/fuchsia.device", + "-I", out + "/fidling/gen/sdk/fidl/fuchsia.device.manager", + "-I", out + "/fidling/gen/sdk/fidl/fuchsia.hardware.nand", + "-I", out + "/fidling/gen/sdk/fidl/fuchsia.hardware.usb.peripheral", + "-I", out + "/fidling/gen/zircon/vdso/zx", + "-L", out + "/" + arch + "-shared", + } +} + func init() { for OS, archs := range List { for arch, target := range archs { |