diff options
| author | Matthew Dempsky <mdempsky@google.com> | 2019-11-19 12:43:42 -0800 |
|---|---|---|
| committer | Marco Vanotti <mvanotti@users.noreply.github.com> | 2019-11-19 17:20:14 -0800 |
| commit | f4b7ed0781fd311fccb2dd56f306a07590d440fd (patch) | |
| tree | e9fc48a2e2c7ff02e0c4c6036c4177bcaf1e270a | |
| parent | b7a277d2bab922c7635c4281dcd6cfff76fd5d95 (diff) | |
tools/fuchsia: remove custom Go toolchain scripts
These used to be required to build Fuchsia's Go toolchain to build
syz-fuzzer to run on Fuchsia. However, Fuchsia now uses HostFuzzer
mode, so only syz-executor (written in C) needs to run on Fuchsia; all
Go code runs on the Host OS (currently Linux).
| -rw-r--r-- | Makefile | 6 | ||||
| -rwxr-xr-x | tools/fuchsia/build-go.sh | 32 | ||||
| -rwxr-xr-x | tools/fuchsia/go | 26 |
3 files changed, 0 insertions, 64 deletions
@@ -206,12 +206,6 @@ ifeq ($(TARGETOS),fuchsia) else endif -fuchsia_go: -ifeq ($(TARGETOS),fuchsia) - ./tools/fuchsia/build-go.sh -else -endif - generate_trace2syz: (cd tools/syz-trace2syz/parser; ragel -Z -G2 -o lex.go straceLex.rl) (cd tools/syz-trace2syz/parser; goyacc -o strace.go -p Strace -v="" strace.y) diff --git a/tools/fuchsia/build-go.sh b/tools/fuchsia/build-go.sh deleted file mode 100755 index 49ce0f418..000000000 --- a/tools/fuchsia/build-go.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -# This script can be used to compile Go for fuchsia. -# You need to have a fuchsia checkout defined in the FX_SRC_PATH variable, -# The fuchsia sdk in the FX_SDK_PATH variable, and a CLANG compatible with -# fuchsia in CLANG_PATH. - -if [[ -z ${FX_SDK_PATH} ]]; then - echo "FX_SDK_PATH variable not set" - exit 1 -fi - -if [[ -z ${FX_SRC_PATH} ]]; then - echo "FX_SRC_PATH variable not set" - exit 1 -fi - -if [[ -z ${CLANG_PATH} ]]; then - echo "CLANG_PATH variable not set" - exit 1 -fi - -cd "${FX_SRC_PATH}/third_party/go/src" - -FUCHSIA_SHARED_LIBS=${FX_SDK_PATH}/arch/x64/lib \ - CLANG_PREFIX=${CLANG_PATH}/bin \ - FDIO_INCLUDE=${FX_SDK_PATH}/pkg/fdio/include \ - ZIRCON_SYSROOT=${FX_SDK_PATH}/arch/x64/sysroot \ - CC=${FX_SRC_PATH}/third_party/go/misc/fuchsia/clangwrap.sh \ - CGO_ENABLED=1 \ - GOOS=fuchsia \ - ./make.bash diff --git a/tools/fuchsia/go b/tools/fuchsia/go deleted file mode 100755 index bff63d190..000000000 --- a/tools/fuchsia/go +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -if [[ -z ${FX_SDK_PATH} ]]; then - echo "FX_SDK_PATH variable not set" - exit 1 -fi - -if [[ -z ${FX_SRC_PATH} ]]; then - echo "FX_SRC_PATH variable not set" - exit 1 -fi - -if [[ -z ${CLANG_PATH} ]]; then - echo "CLANG_PATH variable not set" - exit 1 -fi - -FUCHSIA_SHARED_LIBS="${FX_SDK_PATH}/arch/x64/lib" \ - CLANG_PREFIX="${CLANG_PATH}/bin" \ - FDIO_INCLUDE="${FX_SDK_PATH}/pkg/fdio/include" \ - ZIRCON_SYSROOT="${FX_SDK_PATH}/arch/x64/sysroot" \ - CC="${FX_SRC_PATH}/third_party/go/misc/fuchsia/clangwrap.sh" \ - CGO_ENABLED=1 \ - GOOS=fuchsia \ - GOROOT="${FX_SRC_PATH}/third_party/go" \ - "${FX_SRC_PATH}/third_party/go/bin/go" "$@" |
