Get stuff building with newer Bazel with sandboxing
After this, a newer version of Bazel is required to build the code.
201511240708+4433fa6 is the first version which will work.
Change-Id: Ifc41f11f2f21bdcd0f5f7d142d769ea8fa15921a
diff --git a/tools/cpp/arm-frc-linux-gnueabi/BUILD b/tools/cpp/arm-frc-linux-gnueabi/BUILD
index 4548dbe..64342a9 100644
--- a/tools/cpp/arm-frc-linux-gnueabi/BUILD
+++ b/tools/cpp/arm-frc-linux-gnueabi/BUILD
@@ -17,6 +17,14 @@
)
filegroup(
+ name = 'as',
+ srcs = [
+ '@arm-frc-linux-gnueabi-repo//:as',
+ 'arm-frc-linux-gnueabi-as',
+ ],
+)
+
+filegroup(
name = 'ld',
srcs = [
'@arm-frc-linux-gnueabi-repo//:ld',
@@ -61,6 +69,7 @@
srcs = [
':gcc',
':ar',
+ ':as',
':ld',
':nm',
':objcopy',
diff --git a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-repo b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-repo
deleted file mode 120000
index 1c8656d..0000000
--- a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-repo
+++ /dev/null
@@ -1 +0,0 @@
-../../../bazel-out/../../external/arm-frc-linux-gnueabi-repo
\ No newline at end of file
diff --git a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi.BUILD b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi.BUILD
index e579f39..438c9f1 100644
--- a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi.BUILD
+++ b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi.BUILD
@@ -3,7 +3,7 @@
filegroup(
name = 'gcc',
srcs = [
- 'usr/bin/arm-frc-linux-gnueabi-gcc-4.9',
+ 'usr/bin/arm-frc-linux-gnueabi-gcc',
],
)
@@ -15,6 +15,13 @@
)
filegroup(
+ name = 'as',
+ srcs = [
+ 'usr/bin/arm-frc-linux-gnueabi-as',
+ ],
+)
+
+filegroup(
name = 'ld',
srcs = [
'usr/bin/arm-frc-linux-gnueabi-ld',
@@ -55,6 +62,8 @@
'usr/bin/**/*',
'usr/include/**/*',
'usr/lib/**/*',
+ 'usr/arm-frc-linux-gnueabi/**/*',
+ 'usr/lib/x86_64-linux-gnu/gcc/**/*',
]),
)
@@ -63,6 +72,7 @@
srcs = [
':gcc',
':ar',
+ ':as',
':ld',
':nm',
':objcopy',