From 5b9ad24bb7dfb29a354b3ef883de6e7616e50709 Mon Sep 17 00:00:00 2001 From: iphydf Date: Sun, 24 Dec 2023 00:16:33 +0000 Subject: [PATCH] chore: Disable targets for cross-compilation. This way we can do bazel build //... when cross-compiling. --- BUILD.bazel | 1 + tools/BUILD.bazel | 2 ++ tools/toxsave-convert.hs | 2 +- web/BUILD.bazel | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/BUILD.bazel b/BUILD.bazel index 93a5749d..8d122419 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -9,6 +9,7 @@ haskell_library( srcs = glob(["src/**/*.*hs"]), ghcopts = ["-j4"], src_strip_prefix = "src", + tags = ["no-cross"], version = "0.2.12", visibility = ["//visibility:public"], deps = [ diff --git a/tools/BUILD.bazel b/tools/BUILD.bazel index 41b60209..ec5261e6 100644 --- a/tools/BUILD.bazel +++ b/tools/BUILD.bazel @@ -3,6 +3,7 @@ load("@rules_haskell//haskell:defs.bzl", "haskell_binary", "haskell_test") haskell_binary( name = "toxsave-convert", srcs = ["toxsave-convert.hs"], + tags = ["no-cross"], visibility = ["//tools/haskell:__pkg__"], deps = [ "//hs-toxcore", @@ -17,6 +18,7 @@ haskell_test( name = "toxsave-test", srcs = ["toxsave-test.hs"], ghcopts = ["-optl=-fsanitize=address"], + tags = ["no-cross"], visibility = ["//tools/haskell:__pkg__"], deps = [ "//c-toxcore", diff --git a/tools/toxsave-convert.hs b/tools/toxsave-convert.hs index dbffa883..9341e951 100644 --- a/tools/toxsave-convert.hs +++ b/tools/toxsave-convert.hs @@ -15,4 +15,4 @@ parse str = maybe main :: IO () -main = parse <$> LBS.getContents >>= LBS.putStr +main = LBS.getContents >>= LBS.putStr . parse diff --git a/web/BUILD.bazel b/web/BUILD.bazel index 8bd6b7c9..47ae9e39 100644 --- a/web/BUILD.bazel +++ b/web/BUILD.bazel @@ -3,6 +3,7 @@ load("@rules_haskell//haskell:defs.bzl", "haskell_binary") haskell_binary( name = "webservice", srcs = glob(["**/*.hs"]), + tags = ["no-cross"], visibility = ["//visibility:public"], deps = [ "//hs-msgpack-binary",