Use the downloaded clang when building for armhf-debian
This makes it work on a barebones Stretch installation.
Also add building for this CPU to the CI script so we know it keeps
working, which means marking everything that's supposed to work
appropriately.
Change-Id: Ic050ce20eae45c6b23e0e42dddb24db3ebc70b84
diff --git a/tools/cpp/linaro_linux_gcc/BUILD b/tools/cpp/linaro_linux_gcc/BUILD
index 2c79142..4800436 100644
--- a/tools/cpp/linaro_linux_gcc/BUILD
+++ b/tools/cpp/linaro_linux_gcc/BUILD
@@ -1,113 +1,113 @@
-package(default_visibility = ['//tools/cpp:__pkg__'])
+package(default_visibility = ["//tools/cpp:__pkg__"])
cc_library(
- name = 'libpthread',
- visibility = ['//visibility:public'],
- srcs = [
- 'clang_more_libs/libpthread.so',
- ],
+ name = "libpthread",
+ srcs = [
+ "clang_more_libs/libpthread.so",
+ ],
+ visibility = ["//visibility:public"],
)
filegroup(
- name = 'gcc',
- srcs = [
- '@linaro_linux_gcc_4_9_repo//:gcc',
- 'arm-linux-gnueabihf-gcc',
- ],
+ name = "gcc",
+ srcs = [
+ "arm-linux-gnueabihf-gcc",
+ "@linaro_linux_gcc_4_9_repo//:gcc",
+ ],
)
filegroup(
- name = 'ar',
- srcs = [
- '@linaro_linux_gcc_4_9_repo//:ar',
- 'arm-linux-gnueabihf-ar',
- ],
+ name = "ar",
+ srcs = [
+ "arm-linux-gnueabihf-ar",
+ "@linaro_linux_gcc_4_9_repo//:ar",
+ ],
)
filegroup(
- name = 'ld',
- srcs = [
- '@linaro_linux_gcc_4_9_repo//:ld',
- 'arm-linux-gnueabihf-ld',
- ],
+ name = "ld",
+ srcs = [
+ "arm-linux-gnueabihf-ld",
+ "@linaro_linux_gcc_4_9_repo//:ld",
+ ],
)
filegroup(
- name = 'nm',
- srcs = [
- '@linaro_linux_gcc_4_9_repo//:nm',
- 'arm-linux-gnueabihf-nm',
- ],
+ name = "nm",
+ srcs = [
+ "arm-linux-gnueabihf-nm",
+ "@linaro_linux_gcc_4_9_repo//:nm",
+ ],
)
filegroup(
- name = 'objcopy',
- srcs = [
- '@linaro_linux_gcc_4_9_repo//:objcopy',
- 'arm-linux-gnueabihf-objcopy',
- ],
+ name = "objcopy",
+ srcs = [
+ "arm-linux-gnueabihf-objcopy",
+ "@linaro_linux_gcc_4_9_repo//:objcopy",
+ ],
)
filegroup(
- name = 'objdump',
- srcs = [
- '@linaro_linux_gcc_4_9_repo//:objdump',
- 'arm-linux-gnueabihf-objdump',
- ],
+ name = "objdump",
+ srcs = [
+ "arm-linux-gnueabihf-objdump",
+ "@linaro_linux_gcc_4_9_repo//:objdump",
+ ],
)
filegroup(
- name = 'strip',
- srcs = [
- '@linaro_linux_gcc_4_9_repo//:strip',
- 'arm-linux-gnueabihf-strip',
- ],
+ name = "strip",
+ srcs = [
+ "arm-linux-gnueabihf-strip",
+ "@linaro_linux_gcc_4_9_repo//:strip",
+ ],
)
filegroup(
- name = 'as',
- srcs = [
- '@linaro_linux_gcc_4_9_repo//:as',
- 'arm-linux-gnueabihf-as',
- ],
+ name = "as",
+ srcs = [
+ "arm-linux-gnueabihf-as",
+ "@linaro_linux_gcc_4_9_repo//:as",
+ ],
)
filegroup(
- name = 'clang',
- srcs = [
- 'clang_bin/clang',
- ],
+ name = "clang",
+ srcs = [
+ "clang_bin/clang",
+ ],
)
filegroup(
- name = 'clang-ld',
- srcs = [
- 'clang_bin/ld',
- ':ld',
- ],
+ name = "clang-ld",
+ srcs = [
+ "clang_bin/ld",
+ ":ld",
+ ],
)
filegroup(
- name = 'tool-wrappers',
- srcs = [
- ':gcc',
- ':ar',
- ':ld',
- ':nm',
- ':objcopy',
- ':objdump',
- ':strip',
- ':as',
- 'clang_bin/as',
- ':clang',
- ':clang-ld',
- ],
+ name = "tool-wrappers",
+ srcs = [
+ "clang_bin/as",
+ ":ar",
+ ":as",
+ ":clang",
+ ":clang-ld",
+ ":gcc",
+ ":ld",
+ ":nm",
+ ":objcopy",
+ ":objdump",
+ ":strip",
+ ],
)
filegroup(
- name = 'clang-symlinks',
- srcs = glob([
- 'clang_more_libs/**',
- 'clang_syroot/**',
- ]),
+ name = "clang-symlinks",
+ srcs = glob([
+ "clang_more_libs/**",
+ "clang_syroot/**",
+ ]),
)
diff --git a/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-ar b/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-ar
index 5615844..abdb214 100755
--- a/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-ar
+++ b/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-ar
@@ -1,5 +1,9 @@
#!/bin/bash --norc
+LD_LIBRARY_PATH="${BAZEL_OUTPUT_ROOT}external/linaro_49_deps/usr/lib/x86_64-linux-gnu"
+LD_LIBRARY_PATH+=":${BAZEL_OUTPUT_ROOT}external/linaro_49_deps/lib/x86_64-linux-gnu"
+export LD_LIBRARY_PATH
+
exec -a arm-linux-gnueabihf-ar \
${BAZEL_OUTPUT_ROOT}external/linaro_linux_gcc_4_9_repo/bin/arm-linux-gnueabihf-ar \
"$@"
diff --git a/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-as b/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-as
index 7a67c77..6a749b4 100755
--- a/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-as
+++ b/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-as
@@ -1,5 +1,9 @@
#!/bin/bash --norc
+LD_LIBRARY_PATH="${BAZEL_OUTPUT_ROOT}external/linaro_49_deps/usr/lib/x86_64-linux-gnu"
+LD_LIBRARY_PATH+=":${BAZEL_OUTPUT_ROOT}external/linaro_49_deps/lib/x86_64-linux-gnu"
+export LD_LIBRARY_PATH
+
exec -a arm-linux-gnueabihf-as \
${BAZEL_OUTPUT_ROOT}external/linaro_linux_gcc_4_9_repo/bin/arm-linux-gnueabihf-as \
"$@"
diff --git a/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-cpp b/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-cpp
index 46d8d42..7d97f51 100755
--- a/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-cpp
+++ b/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-cpp
@@ -1,5 +1,9 @@
#!/bin/bash --norc
+LD_LIBRARY_PATH="${BAZEL_OUTPUT_ROOT}external/linaro_49_deps/usr/lib/x86_64-linux-gnu"
+LD_LIBRARY_PATH+=":${BAZEL_OUTPUT_ROOT}external/linaro_49_deps/lib/x86_64-linux-gnu"
+export LD_LIBRARY_PATH
+
exec -a arm-linux-gnueabihf-cpp \
${BAZEL_OUTPUT_ROOT}external/linaro_linux_gcc_4_9_repo/bin/arm-linux-gnueabihf-cpp \
"$@"
diff --git a/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-gcc b/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-gcc
index c70d6b3..71dd060 100755
--- a/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-gcc
+++ b/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-gcc
@@ -1,5 +1,9 @@
#!/bin/bash --norc
+LD_LIBRARY_PATH="${BAZEL_OUTPUT_ROOT}external/linaro_49_deps/usr/lib/x86_64-linux-gnu"
+LD_LIBRARY_PATH+=":${BAZEL_OUTPUT_ROOT}external/linaro_49_deps/lib/x86_64-linux-gnu"
+export LD_LIBRARY_PATH
+
PATH="${BAZEL_OUTPUT_ROOT}external/linaro_linux_gcc_4_9_repo/libexec/gcc/arm-linux-gnueabihf/4.9.3:$PATH" \
exec \
${BAZEL_OUTPUT_ROOT}external/linaro_linux_gcc_4_9_repo/bin/arm-linux-gnueabihf-gcc \
diff --git a/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-gcov b/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-gcov
index 4525f95..5e179c4 100755
--- a/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-gcov
+++ b/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-gcov
@@ -1,5 +1,9 @@
#!/bin/bash --norc
+LD_LIBRARY_PATH="${BAZEL_OUTPUT_ROOT}external/linaro_49_deps/usr/lib/x86_64-linux-gnu"
+LD_LIBRARY_PATH+=":${BAZEL_OUTPUT_ROOT}external/linaro_49_deps/lib/x86_64-linux-gnu"
+export LD_LIBRARY_PATH
+
exec -a arm-linux-gnueabihf-gcov \
${BAZEL_OUTPUT_ROOT}external/linaro_linux_gcc_4_9_repo/bin/arm-linux-gnueabihf-gcov \
"$@"
diff --git a/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-ld b/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-ld
index 566df55..b4b9fb2 100755
--- a/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-ld
+++ b/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-ld
@@ -1,5 +1,9 @@
#!/bin/bash --norc
+LD_LIBRARY_PATH="${BAZEL_OUTPUT_ROOT}external/linaro_49_deps/usr/lib/x86_64-linux-gnu"
+LD_LIBRARY_PATH+=":${BAZEL_OUTPUT_ROOT}external/linaro_49_deps/lib/x86_64-linux-gnu"
+export LD_LIBRARY_PATH
+
exec -a arm-linux-gnueabihf-ld \
${BAZEL_OUTPUT_ROOT}external/linaro_linux_gcc_4_9_repo/bin/arm-linux-gnueabihf-ld \
"$@"
diff --git a/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-nm b/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-nm
index 7dde30a..514dc67 100755
--- a/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-nm
+++ b/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-nm
@@ -1,5 +1,9 @@
#!/bin/bash --norc
+LD_LIBRARY_PATH="${BAZEL_OUTPUT_ROOT}external/linaro_49_deps/usr/lib/x86_64-linux-gnu"
+LD_LIBRARY_PATH+=":${BAZEL_OUTPUT_ROOT}external/linaro_49_deps/lib/x86_64-linux-gnu"
+export LD_LIBRARY_PATH
+
exec -a arm-linux-gnueabihf-nm \
${BAZEL_OUTPUT_ROOT}external/linaro_linux_gcc_4_9_repo/bin/arm-linux-gnueabihf-nm \
"$@"
diff --git a/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-objcopy b/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-objcopy
index 97d912f..d435e92 100755
--- a/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-objcopy
+++ b/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-objcopy
@@ -1,5 +1,9 @@
#!/bin/bash --norc
+LD_LIBRARY_PATH="${BAZEL_OUTPUT_ROOT}external/linaro_49_deps/usr/lib/x86_64-linux-gnu"
+LD_LIBRARY_PATH+=":${BAZEL_OUTPUT_ROOT}external/linaro_49_deps/lib/x86_64-linux-gnu"
+export LD_LIBRARY_PATH
+
exec -a arm-linux-gnueabihf-objcopy \
${BAZEL_OUTPUT_ROOT}external/linaro_linux_gcc_4_9_repo/bin/arm-linux-gnueabihf-objcopy \
"$@"
diff --git a/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-objdump b/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-objdump
index 561dc89..260d9c0 100755
--- a/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-objdump
+++ b/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-objdump
@@ -1,5 +1,9 @@
#!/bin/bash --norc
+LD_LIBRARY_PATH="${BAZEL_OUTPUT_ROOT}external/linaro_49_deps/usr/lib/x86_64-linux-gnu"
+LD_LIBRARY_PATH+=":${BAZEL_OUTPUT_ROOT}external/linaro_49_deps/lib/x86_64-linux-gnu"
+export LD_LIBRARY_PATH
+
exec -a arm-linux-gnueabihf-objdump \
${BAZEL_OUTPUT_ROOT}external/linaro_linux_gcc_4_9_repo/bin/arm-linux-gnueabihf-objdump \
"$@"
diff --git a/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-strip b/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-strip
index 45024d3..2942227 100755
--- a/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-strip
+++ b/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-strip
@@ -1,5 +1,9 @@
#!/bin/bash --norc
+LD_LIBRARY_PATH="${BAZEL_OUTPUT_ROOT}external/linaro_49_deps/usr/lib/x86_64-linux-gnu"
+LD_LIBRARY_PATH+=":${BAZEL_OUTPUT_ROOT}external/linaro_49_deps/lib/x86_64-linux-gnu"
+export LD_LIBRARY_PATH
+
exec -a arm-linux-gnueabihf-strip \
${BAZEL_OUTPUT_ROOT}external/linaro_linux_gcc_4_9_repo/bin/arm-linux-gnueabihf-strip \
"$@"
diff --git a/tools/cpp/linaro_linux_gcc/clang_bin/clang b/tools/cpp/linaro_linux_gcc/clang_bin/clang
index 2ed616a..99f6067 100755
--- a/tools/cpp/linaro_linux_gcc/clang_bin/clang
+++ b/tools/cpp/linaro_linux_gcc/clang_bin/clang
@@ -1,4 +1,4 @@
#!/bin/bash --norc
exec -a "$0" \
- "/usr/bin/clang-3.6" "$@"
+ "tools/cpp/clang_3p6/x86_64-linux-gnu-clang-3.6" "$@"