aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Chris Parsons <cparsons@google.com>2015-10-29 17:14:20 +0000
committerGravatar Lukacs Berki <lberki@google.com>2015-10-30 09:46:46 +0000
commit5d96a28e5dbe43737df9297642132874cecdf1c3 (patch)
tree9261a84eb1e310371821ffca67a3211d275504a8 /src
parent702c844c6e41bc28a301101de13f6ff3cb0c3080 (diff)
handle darwin_x86_64 target cpu
-- MOS_MIGRATED_REVID=106605250
Diffstat (limited to 'src')
-rw-r--r--src/BUILD8
-rw-r--r--src/main/cpp/BUILD8
-rw-r--r--src/main/native/BUILD2
-rw-r--r--src/main/tools/BUILD2
4 files changed, 20 insertions, 0 deletions
diff --git a/src/BUILD b/src/BUILD
index 00c2cb37e9..441bf608d6 100644
--- 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 {
@@ -132,6 +134,12 @@ config_setting(
)
config_setting(
+ name = "darwin_x86_64",
+ values = {"cpu": "darwin_x86_64"},
+ visibility = ["//visibility:public"],
+)
+
+config_setting(
name = "freebsd",
values = {"cpu": "freebsd"},
visibility = ["//visibility:public"],
diff --git a/src/main/cpp/BUILD b/src/main/cpp/BUILD
index 7954a67dab..09bd6a3150 100644
--- 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
index 97a4e9a48a..14080c205b 100644
--- 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
index 4a87f650a2..f24ef99482 100644
--- a/src/main/tools/BUILD
+++ b/src/main/tools/BUILD
@@ -32,6 +32,7 @@ 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"],
}),
@@ -39,6 +40,7 @@ cc_binary(
linkopts = ["-lm"],
deps = select({
"//src:darwin": [],
+ "//src:darwin_x86_64": [],
"//src:freebsd": [],
"//conditions:default": [
":process-tools",