handle darwin_x86_64 target cpu

-- MOS_MIGRATED_REVID=106605250
ibmsoe · Oct 30, 2015 · 5d96a28 · 5d96a28
1 parent 702c844
commit 5d96a28
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 0 deletions.
diff --git a/src/BUILD b/src/BUILD
@@ -7,6 +7,7 @@ filegroup(
     name = "libunix",
     srcs = select({
         ":darwin": ["//src/main/native:libunix.dylib"],
+        ":darwin_x86_64": ["//src/main/native:libunix.dylib"],
         "//conditions:default": ["//src/main/native:libunix.so"],
     }),
     visibility = [
@@ -29,6 +30,7 @@ filegroup(
     outs = ["install_base_key" + suffix],
     cmd = select({
         ":darwin": md5_cmd % "/sbin/md5",
+        ":darwin_x86_64": md5_cmd % "/sbin/md5",
         "//conditions:default": md5_cmd % "md5sum",
     }),
 ) for suffix, embedded_tools in {
@@ -131,6 +133,12 @@ config_setting(
     visibility = ["//visibility:public"],
 )
 
+config_setting(
+    name = "darwin_x86_64",
+    values = {"cpu": "darwin_x86_64"},
+    visibility = ["//visibility:public"],
+)
+
 config_setting(
     name = "freebsd",
     values = {"cpu": "freebsd"},

diff --git a/src/main/cpp/BUILD b/src/main/cpp/BUILD
@@ -13,6 +13,10 @@ cc_library(
             "blaze_util_darwin.cc",
             "blaze_util_posix.cc",
         ],
+        "//src:darwin_x86_64": [
+            "blaze_util_darwin.cc",
+            "blaze_util_posix.cc",
+        ],
         "//src:freebsd": [
             "blaze_util_freebsd.cc",
             "blaze_util_posix.cc",
@@ -29,6 +33,8 @@ cc_library(
     linkopts = select({
         "//src:darwin": [
         ],
+        "//src:darwin_x86_64": [
+        ],
         "//src:freebsd": [
         ],
         "//conditions:default": [
@@ -60,6 +66,8 @@ cc_binary(
     linkopts = select({
         "//src:darwin": [
         ],
+        "//src:darwin_x86_64": [
+        ],
         "//src:freebsd": [
             "-lprocstat",
         ],

diff --git a/src/main/native/BUILD b/src/main/native/BUILD
@@ -2,6 +2,7 @@ genrule(
     name = "copy_link_jni_md_header",
     srcs = select({
         "//src:darwin": ["//tools/jdk:jni_md_header-darwin"],
+        "//src:darwin_x86_64": ["//tools/jdk:jni_md_header-darwin"],
         "//src:freebsd": ["//tools/jdk:jni_md_header-freebsd"],
         "//conditions:default": ["//tools/jdk:jni_md_header-linux"],
     }),
@@ -20,6 +21,7 @@ filegroup(
     name = "jni_os",
     srcs = select({
         "//src:darwin": ["unix_jni_darwin.cc"],
+        "//src:darwin_x86_64": ["unix_jni_darwin.cc"],
         "//src:freebsd": ["unix_jni_freebsd.cc"],
         "//conditions:default": ["unix_jni_linux.cc"],
     }),

diff --git a/src/main/tools/BUILD b/src/main/tools/BUILD
@@ -32,13 +32,15 @@ cc_binary(
     name = "namespace-sandbox",
     srcs = select({
         "//src:darwin": ["namespace-sandbox-dummy.c"],
+        "//src:darwin_x86_64": ["namespace-sandbox-dummy.c"],
         "//src:freebsd": ["namespace-sandbox-dummy.c"],
         "//conditions:default": ["namespace-sandbox.c"],
     }),
     copts = ["-std=c99"],
     linkopts = ["-lm"],
     deps = select({
         "//src:darwin": [],
+        "//src:darwin_x86_64": [],
         "//src:freebsd": [],
         "//conditions:default": [
             ":process-tools",