aboutsummaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2018-06-26 18:59:07 +0200
committerDmitry Vyukov <dvyukov@google.com>2018-06-26 18:59:07 +0200
commiteecefab32c6f158629abd2ac7f6cb0b070f88b4a (patch)
treeae5b25c59c3f574c36f79144bf48117ad963dac1 /sys
parentb5f361149e86046a6cd8db76f26d75451a27fcab (diff)
Makefile: fix fuchsia build
Diffstat (limited to 'sys')
-rw-r--r--sys/targets/targets.go10
1 files changed, 8 insertions, 2 deletions
diff --git a/sys/targets/targets.go b/sys/targets/targets.go
index 2325f17c3..18fa08583 100644
--- a/sys/targets/targets.go
+++ b/sys/targets/targets.go
@@ -148,12 +148,16 @@ var List = map[string]map[string]*Target{
PageSize: 4 << 10,
CArch: []string{"__x86_64__"},
KernelHeaderArch: "x64",
- CCompiler: os.ExpandEnv("${SOURCEDIR}/buildtools/linux-x64/clang/bin/clang"),
+ CCompiler: os.ExpandEnv("${SOURCEDIR}/buildtools/linux-x64/clang/bin/clang++"),
CrossCFlags: []string{
+ "-Wno-deprecated",
+ "-Wno-error",
"--target=x86_64-fuchsia",
"-lfdio",
"-lzircon",
"--sysroot", os.ExpandEnv("${SOURCEDIR}/out/build-zircon/build-x64/sysroot"),
+ "-L", "${SOURCEDIR}/out/x64/x64-shared",
+ "-L", "${SOURCEDIR}/out/x64/sdks/zircon_sysroot/sysroot/lib",
},
},
"arm64": {
@@ -161,8 +165,10 @@ var List = map[string]map[string]*Target{
PageSize: 4 << 10,
CArch: []string{"__aarch64__"},
KernelHeaderArch: "arm64",
- CCompiler: os.ExpandEnv("${SOURCEDIR}/buildtools/linux-x64/clang/bin/clang"),
+ CCompiler: os.ExpandEnv("${SOURCEDIR}/buildtools/linux-x64/clang/bin/clang++"),
CrossCFlags: []string{
+ "-Wno-deprecated",
+ "-Wno-error",
"--target=aarch64-fuchsia",
"-lfdio",
"-lzircon",