Fix iOS cross compilation and enable test (#2099)

Updates #2079
bazel-contrib · Jun 18, 2019 · a1f357e · a1f357e
1 parent f2373c9
commit a1f357e
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 32 deletions.
diff --git a/go/private/platforms.bzl b/go/private/platforms.bzl
@@ -168,15 +168,15 @@ def _generate_platforms():
         platforms.append(struct(
             name = "ios_" + goarch,
             goos = "darwin",
-            goarch = "goarch",
+            goarch = goarch,
             constraints = constraints,
             cgo = False,
         ))
         constraints[-1] = "@io_bazel_rules_go//go/toolchain:cgo_on"
         platforms.append(struct(
             name = "ios_" + goarch + "_cgo",
             goos = "darwin",
-            goarch = "goarch",
+            goarch = goarch,
             constraints = constraints,
             cgo = True,
         ))

diff --git a/tests/core/cross/BUILD.bazel b/tests/core/cross/BUILD.bazel
@@ -50,36 +50,33 @@ go_test(
     deps = ["//go/tools/bazel:go_default_library"],
 )
 
-# TODO(#2090): enable test when cgo toolchains are sorted out. This won't
-# build on non-darwin platforms if we need a C/C++ toolchain.
-
-# bazel_test(
-#     name = "ios_select_test",
-#     args = ["--platforms=@io_bazel_rules_go//go/toolchain:ios_amd64"],
-#     command = "build",
-#     targets = [":ios_lib"],
-# )
+bazel_test(
+    name = "ios_select_test",
+    args = ["--platforms=@io_bazel_rules_go//go/toolchain:ios_amd64"],
+    command = "build",
+    targets = [":ios_lib"],
+)
 
-# go_library(
-#     name = "use_ios_lib",
-#     importpath = "github.com/bazelbuild/rules_go/tests/core/cross/use_ios_lib",
-#     deps = select({
-#         ":is_osx": [":ios_lib"],
-#         "//conditions:default": [],
-#     }),
-# )
+go_library(
+    name = "use_ios_lib",
+    importpath = "github.com/bazelbuild/rules_go/tests/core/cross/use_ios_lib",
+    deps = select({
+        ":is_osx": [":ios_lib"],
+        "//conditions:default": [],
+    }),
+)
 
-# config_setting(
-#     name = "is_osx",
-#     constraint_values = ["@bazel_tools//platforms:osx"],
-# )
+config_setting(
+    name = "is_osx",
+    constraint_values = ["@bazel_tools//platforms:osx"],
+)
 
-# go_library(
-#     name = "ios_lib",
-#     srcs = select({
-#         "@io_bazel_rules_go//go/platform:darwin": ["ios_good.go"],
-#         "//conditions:default": ["ios_bad.go"],
-#     }),
-#     importpath = "github.com/bazelbuild/rules_go/tests/core/cross/ios_lib",
-#     tags = ["manual"],
-# )
+go_library(
+    name = "ios_lib",
+    srcs = select({
+        "@io_bazel_rules_go//go/platform:darwin": ["ios_good.go"],
+        "//conditions:default": ["ios_bad.go"],
+    }),
+    importpath = "github.com/bazelbuild/rules_go/tests/core/cross/ios_lib",
+    tags = ["manual"],
+)