aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2018-07-07 19:08:38 +0200
committerDmitry Vyukov <dvyukov@google.com>2018-07-07 19:08:38 +0200
commitc9a7a4dccd8bf8153d409a7a78bc1804b41f5fff (patch)
treeddcdc669b59a8772267fee83949ebcadc6c3e1a2
parent4b2ad42d418946035909ca755d1a254d35604e60 (diff)
executor: executor fix fuchsia build
-rw-r--r--executor/common_fuchsia.h1
-rw-r--r--pkg/csource/fuchsia_common.go1
-rw-r--r--sys/targets/targets.go4
3 files changed, 6 insertions, 0 deletions
diff --git a/executor/common_fuchsia.h b/executor/common_fuchsia.h
index 347ac4edd..d9436e40a 100644
--- a/executor/common_fuchsia.h
+++ b/executor/common_fuchsia.h
@@ -7,6 +7,7 @@
#define _GNU_SOURCE
#endif
+#include <ddk/driver.h>
#include <fcntl.h>
#include <poll.h>
#include <signal.h>
diff --git a/pkg/csource/fuchsia_common.go b/pkg/csource/fuchsia_common.go
index 69c91c4a4..0b509f0ff 100644
--- a/pkg/csource/fuchsia_common.go
+++ b/pkg/csource/fuchsia_common.go
@@ -9,6 +9,7 @@ var commonHeaderFuchsia = `
#define _GNU_SOURCE
#endif
+#include <ddk/driver.h>
#include <fcntl.h>
#include <poll.h>
#include <signal.h>
diff --git a/sys/targets/targets.go b/sys/targets/targets.go
index 854167873..9401a551c 100644
--- a/sys/targets/targets.go
+++ b/sys/targets/targets.go
@@ -155,9 +155,11 @@ var List = map[string]map[string]*Target{
"--target=x86_64-fuchsia",
"-lfdio",
"-lzircon",
+ "-ldriver",
"--sysroot", os.ExpandEnv("${SOURCEDIR}/out/build-zircon/build-x64/sysroot"),
"-L", os.ExpandEnv("${SOURCEDIR}/out/x64/x64-shared"),
"-L", os.ExpandEnv("${SOURCEDIR}/out/x64/sdks/zircon_sysroot/sysroot/lib"),
+ "-L", os.ExpandEnv("${SOURCEDIR}/out/build-zircon/build-x64/system/ulib/driver"),
},
},
"arm64": {
@@ -172,9 +174,11 @@ var List = map[string]map[string]*Target{
"--target=aarch64-fuchsia",
"-lfdio",
"-lzircon",
+ "-ldriver",
"--sysroot", os.ExpandEnv("${SOURCEDIR}/out/build-zircon/build-arm64/sysroot"),
"-L", os.ExpandEnv("${SOURCEDIR}/out/arm64/arm64-shared"),
"-L", os.ExpandEnv("${SOURCEDIR}/out/arm64/sdks/zircon_sysroot/sysroot/lib"),
+ "-L", os.ExpandEnv("${SOURCEDIR}/out/build-zircon/build-arm64/system/ulib/driver"),
},
},
},