Renamed linaro compiler to work with the new bazel.
Change-Id: I48eaf7a54677d970e39aacc7c23f902889158b2f
diff --git a/tools/cpp/BUILD b/tools/cpp/BUILD
index 44eaa41..40e674f 100644
--- a/tools/cpp/BUILD
+++ b/tools/cpp/BUILD
@@ -41,7 +41,7 @@
'@arm_frc_linux_gnueabi_repo//:compiler_components',
':roborio-compiler-files',
':flags_compiler_inputs',
- '@linaro_linux_gcc_4.9_repo//:compiler_components',
+ '@linaro_linux_gcc_4_9_repo//:compiler_components',
':linaro-gcc-files',
],
)
@@ -120,7 +120,7 @@
srcs = [
'//tools/cpp/linaro_linux_gcc:clang-symlinks',
'//tools/cpp/linaro_linux_gcc:tool-wrappers',
- '@linaro_linux_gcc_4.9_repo//:compiler_pieces',
+ '@linaro_linux_gcc_4_9_repo//:compiler_pieces',
],
)
@@ -132,7 +132,7 @@
'//tools/cpp/linaro_linux_gcc:ar',
'//tools/cpp/linaro_linux_gcc:clang-ld',
'//tools/cpp/linaro_linux_gcc:clang',
- '@linaro_linux_gcc_4.9_repo//:compiler_pieces',
+ '@linaro_linux_gcc_4_9_repo//:compiler_pieces',
],
)
diff --git a/tools/cpp/CROSSTOOL b/tools/cpp/CROSSTOOL
index f483e2b..ce31d2b 100644
--- a/tools/cpp/CROSSTOOL
+++ b/tools/cpp/CROSSTOOL
@@ -566,7 +566,7 @@
compiler_flag: "-target"
compiler_flag: "armv7a-arm-linux-gnueabif"
- compiler_flag: "--sysroot=external/linaro_linux_gcc_4.9_repo/arm-linux-gnueabihf/libc"
+ compiler_flag: "--sysroot=external/linaro_linux_gcc_4_9_repo/arm-linux-gnueabihf/libc"
compiler_flag: "-mfloat-abi=hard"
compiler_flag: "-mfpu=vfpv3-d16"
@@ -574,41 +574,41 @@
compiler_flag: "-isystem"
compiler_flag: "/usr/lib/clang/3.6/include"
compiler_flag: "-isystem"
- compiler_flag: "external/linaro_linux_gcc_4.9_repo/lib/gcc/arm-linux-gnueabihf/4.9.3/include"
+ compiler_flag: "external/linaro_linux_gcc_4_9_repo/lib/gcc/arm-linux-gnueabihf/4.9.3/include"
compiler_flag: "-isystem"
- compiler_flag: "external/linaro_linux_gcc_4.9_repo/arm-linux-gnueabihf/libc/usr/include"
+ compiler_flag: "external/linaro_linux_gcc_4_9_repo/arm-linux-gnueabihf/libc/usr/include"
compiler_flag: "-isystem"
- compiler_flag: "external/linaro_linux_gcc_4.9_repo/lib/gcc/arm-linux-gnueabihf/4.9.3/include-fixed"
+ compiler_flag: "external/linaro_linux_gcc_4_9_repo/lib/gcc/arm-linux-gnueabihf/4.9.3/include-fixed"
cxx_flag: "-isystem"
- cxx_flag: "external/linaro_linux_gcc_4.9_repo/arm-linux-gnueabihf/include/c++/4.9.3/arm-linux-gnueabihf"
+ cxx_flag: "external/linaro_linux_gcc_4_9_repo/arm-linux-gnueabihf/include/c++/4.9.3/arm-linux-gnueabihf"
cxx_flag: "-isystem"
- cxx_flag: "external/linaro_linux_gcc_4.9_repo/arm-linux-gnueabihf/include/c++/4.9.3"
+ cxx_flag: "external/linaro_linux_gcc_4_9_repo/arm-linux-gnueabihf/include/c++/4.9.3"
cxx_flag: "-isystem"
- cxx_flag: "external/linaro_linux_gcc_4.9_repo/include/c++/4.9.3/arm-linux-gnueabihf"
+ cxx_flag: "external/linaro_linux_gcc_4_9_repo/include/c++/4.9.3/arm-linux-gnueabihf"
cxx_flag: "-isystem"
- cxx_flag: "external/linaro_linux_gcc_4.9_repo/include/c++/4.9.3"
+ cxx_flag: "external/linaro_linux_gcc_4_9_repo/include/c++/4.9.3"
- cxx_builtin_include_directory: "%package(@linaro_linux_gcc_4.9_repo//include)%"
- cxx_builtin_include_directory: "%package(@linaro_linux_gcc_4.9_repo//arm-linux-gnueabihf/libc/usr/include)%"
- cxx_builtin_include_directory: "%package(@linaro_linux_gcc_4.9_repo//arm-linux-gnueabihf/libc/usr/lib/include)%"
- cxx_builtin_include_directory: "%package(@linaro_linux_gcc_4.9_repo//arm-linux-gnueabihf/libc/lib/gcc/arm-linux-gnueabihf/4.9.3/include-fixed)%"
- cxx_builtin_include_directory: "%package(@linaro_linux_gcc_4.9_repo//include)%/c++/4.9.3"
- cxx_builtin_include_directory: "%package(@linaro_linux_gcc_4.9_repo//arm-linux-gnueabihf/libc/lib/gcc/arm-linux-gnueabihf/4.9.3/include)%"
- cxx_builtin_include_directory: "%package(@linaro_linux_gcc_4.9_repo//arm-linux-gnueabihf/libc/lib/gcc/arm-linux-gnueabihf/4.9.3/include-fixed)%"
- cxx_builtin_include_directory: "%package(@linaro_linux_gcc_4.9_repo//lib/gcc/arm-linux-gnueabihf/4.9.3/include)%"
- cxx_builtin_include_directory: "%package(@linaro_linux_gcc_4.9_repo//lib/gcc/arm-linux-gnueabihf/4.9.3/include-fixed)%"
- cxx_builtin_include_directory: "%package(@linaro_linux_gcc_4.9_repo//arm-linux-gnueabihf/include)%/c++/4.9.3"
+ cxx_builtin_include_directory: "%package(@linaro_linux_gcc_4_9_repo//include)%"
+ cxx_builtin_include_directory: "%package(@linaro_linux_gcc_4_9_repo//arm-linux-gnueabihf/libc/usr/include)%"
+ cxx_builtin_include_directory: "%package(@linaro_linux_gcc_4_9_repo//arm-linux-gnueabihf/libc/usr/lib/include)%"
+ cxx_builtin_include_directory: "%package(@linaro_linux_gcc_4_9_repo//arm-linux-gnueabihf/libc/lib/gcc/arm-linux-gnueabihf/4.9.3/include-fixed)%"
+ cxx_builtin_include_directory: "%package(@linaro_linux_gcc_4_9_repo//include)%/c++/4.9.3"
+ cxx_builtin_include_directory: "%package(@linaro_linux_gcc_4_9_repo//arm-linux-gnueabihf/libc/lib/gcc/arm-linux-gnueabihf/4.9.3/include)%"
+ cxx_builtin_include_directory: "%package(@linaro_linux_gcc_4_9_repo//arm-linux-gnueabihf/libc/lib/gcc/arm-linux-gnueabihf/4.9.3/include-fixed)%"
+ cxx_builtin_include_directory: "%package(@linaro_linux_gcc_4_9_repo//lib/gcc/arm-linux-gnueabihf/4.9.3/include)%"
+ cxx_builtin_include_directory: "%package(@linaro_linux_gcc_4_9_repo//lib/gcc/arm-linux-gnueabihf/4.9.3/include-fixed)%"
+ cxx_builtin_include_directory: "%package(@linaro_linux_gcc_4_9_repo//arm-linux-gnueabihf/include)%/c++/4.9.3"
cxx_builtin_include_directory: '/usr/lib/clang/3.6/include'
linker_flag: "-target"
linker_flag: "armv7a-arm-linux-gnueabif"
- linker_flag: "--sysroot=external/linaro_linux_gcc_4.9_repo/arm-linux-gnueabihf/libc"
+ linker_flag: "--sysroot=external/linaro_linux_gcc_4_9_repo/arm-linux-gnueabihf/libc"
linker_flag: "-lstdc++"
linker_flag: "-Ltools/cpp/linaro_linux_gcc/clang_more_libs"
- linker_flag: "-Lexternal/linaro_linux_gcc_4.9_repo/arm-linux-gnueabihf/lib"
- linker_flag: "-Lexternal/linaro_linux_gcc_4.9_repo/arm-linux-gnueabihf/libc/lib"
- linker_flag: "-Lexternal/linaro_linux_gcc_4.9_repo/arm-linux-gnueabihf/libc/usr/lib"
- linker_flag: "-Bexternal/linaro_linux_gcc_4.9_repo/arm-linux-gnueabihf/bin"
+ linker_flag: "-Lexternal/linaro_linux_gcc_4_9_repo/arm-linux-gnueabihf/lib"
+ linker_flag: "-Lexternal/linaro_linux_gcc_4_9_repo/arm-linux-gnueabihf/libc/lib"
+ linker_flag: "-Lexternal/linaro_linux_gcc_4_9_repo/arm-linux-gnueabihf/libc/usr/lib"
+ linker_flag: "-Bexternal/linaro_linux_gcc_4_9_repo/arm-linux-gnueabihf/bin"
linker_flag: "-Wl,--dynamic-linker=/lib/ld-linux-armhf.so.3"
feature {
diff --git a/tools/cpp/linaro_linux_gcc/BUILD b/tools/cpp/linaro_linux_gcc/BUILD
index ad3dbb1..2c79142 100644
--- a/tools/cpp/linaro_linux_gcc/BUILD
+++ b/tools/cpp/linaro_linux_gcc/BUILD
@@ -11,7 +11,7 @@
filegroup(
name = 'gcc',
srcs = [
- '@linaro_linux_gcc_4.9_repo//:gcc',
+ '@linaro_linux_gcc_4_9_repo//:gcc',
'arm-linux-gnueabihf-gcc',
],
)
@@ -19,7 +19,7 @@
filegroup(
name = 'ar',
srcs = [
- '@linaro_linux_gcc_4.9_repo//:ar',
+ '@linaro_linux_gcc_4_9_repo//:ar',
'arm-linux-gnueabihf-ar',
],
)
@@ -27,7 +27,7 @@
filegroup(
name = 'ld',
srcs = [
- '@linaro_linux_gcc_4.9_repo//:ld',
+ '@linaro_linux_gcc_4_9_repo//:ld',
'arm-linux-gnueabihf-ld',
],
)
@@ -35,7 +35,7 @@
filegroup(
name = 'nm',
srcs = [
- '@linaro_linux_gcc_4.9_repo//:nm',
+ '@linaro_linux_gcc_4_9_repo//:nm',
'arm-linux-gnueabihf-nm',
],
)
@@ -43,7 +43,7 @@
filegroup(
name = 'objcopy',
srcs = [
- '@linaro_linux_gcc_4.9_repo//:objcopy',
+ '@linaro_linux_gcc_4_9_repo//:objcopy',
'arm-linux-gnueabihf-objcopy',
],
)
@@ -51,7 +51,7 @@
filegroup(
name = 'objdump',
srcs = [
- '@linaro_linux_gcc_4.9_repo//:objdump',
+ '@linaro_linux_gcc_4_9_repo//:objdump',
'arm-linux-gnueabihf-objdump',
],
)
@@ -59,7 +59,7 @@
filegroup(
name = 'strip',
srcs = [
- '@linaro_linux_gcc_4.9_repo//:strip',
+ '@linaro_linux_gcc_4_9_repo//:strip',
'arm-linux-gnueabihf-strip',
],
)
@@ -67,7 +67,7 @@
filegroup(
name = 'as',
srcs = [
- '@linaro_linux_gcc_4.9_repo//:as',
+ '@linaro_linux_gcc_4_9_repo//:as',
'arm-linux-gnueabihf-as',
],
)
diff --git a/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-ar b/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-ar
index 2d4b527..5615844 100755
--- a/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-ar
+++ b/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-ar
@@ -1,5 +1,5 @@
#!/bin/bash --norc
exec -a arm-linux-gnueabihf-ar \
- ${BAZEL_OUTPUT_ROOT}external/linaro_linux_gcc_4.9_repo/bin/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 2b5b029..7a67c77 100755
--- a/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-as
+++ b/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-as
@@ -1,5 +1,5 @@
#!/bin/bash --norc
exec -a arm-linux-gnueabihf-as \
- ${BAZEL_OUTPUT_ROOT}external/linaro_linux_gcc_4.9_repo/bin/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 a4eb2ec..46d8d42 100755
--- a/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-cpp
+++ b/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-cpp
@@ -1,5 +1,5 @@
#!/bin/bash --norc
exec -a arm-linux-gnueabihf-cpp \
- ${BAZEL_OUTPUT_ROOT}external/linaro_linux_gcc_4.9_repo/bin/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 68e33da..c70d6b3 100755
--- a/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-gcc
+++ b/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-gcc
@@ -1,6 +1,6 @@
#!/bin/bash --norc
-PATH="${BAZEL_OUTPUT_ROOT}external/linaro_linux_gcc_4.9_repo/libexec/gcc/arm-linux-gnueabihf/4.9.3:$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 \
+ ${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 cec171c..4525f95 100755
--- a/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-gcov
+++ b/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-gcov
@@ -1,5 +1,5 @@
#!/bin/bash --norc
exec -a arm-linux-gnueabihf-gcov \
- ${BAZEL_OUTPUT_ROOT}external/linaro_linux_gcc_4.9_repo/bin/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 a134b14..566df55 100755
--- a/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-ld
+++ b/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-ld
@@ -1,5 +1,5 @@
#!/bin/bash --norc
exec -a arm-linux-gnueabihf-ld \
- ${BAZEL_OUTPUT_ROOT}external/linaro_linux_gcc_4.9_repo/bin/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 d066ebd..7dde30a 100755
--- a/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-nm
+++ b/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-nm
@@ -1,5 +1,5 @@
#!/bin/bash --norc
exec -a arm-linux-gnueabihf-nm \
- ${BAZEL_OUTPUT_ROOT}external/linaro_linux_gcc_4.9_repo/bin/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 e3ac78d..97d912f 100755
--- a/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-objcopy
+++ b/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-objcopy
@@ -1,5 +1,5 @@
#!/bin/bash --norc
exec -a arm-linux-gnueabihf-objcopy \
- ${BAZEL_OUTPUT_ROOT}external/linaro_linux_gcc_4.9_repo/bin/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 f33793a..561dc89 100755
--- a/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-objdump
+++ b/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-objdump
@@ -1,5 +1,5 @@
#!/bin/bash --norc
exec -a arm-linux-gnueabihf-objdump \
- ${BAZEL_OUTPUT_ROOT}external/linaro_linux_gcc_4.9_repo/bin/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 4f7bbf2..45024d3 100755
--- a/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-strip
+++ b/tools/cpp/linaro_linux_gcc/arm-linux-gnueabihf-strip
@@ -1,5 +1,5 @@
#!/bin/bash --norc
exec -a arm-linux-gnueabihf-strip \
- ${BAZEL_OUTPUT_ROOT}external/linaro_linux_gcc_4.9_repo/bin/arm-linux-gnueabihf-strip \
+ ${BAZEL_OUTPUT_ROOT}external/linaro_linux_gcc_4_9_repo/bin/arm-linux-gnueabihf-strip \
"$@"