Do not resolve to real/absolute link in GCC 4.6 / 4.7

Add -no-canonical-prefixes to both compiler and linker in GCC 4.6/4.7
to not resolve to absolute path (ie. the GCC 4.4.3 default behavior),
otherwise it may fail in distributed build system because the real
path may differ from machine to machine.

Change-Id: I1801bbcfc738e5d955b1ee40a5f1cd81da091ad4

9 files changed, 28 insertions, 16 deletions

diff --git a/toolchains/arm-linux-androideabi-4.6/setup.mk b/toolchains/arm-linux-androideabi-4.6/setup.mk
index 3c2f01783..26596db01 100644
--- a/toolchains/arm-linux-androideabi-4.6/setup.mk
+++ b/toolchains/arm-linux-androideabi-4.6/setup.mk
@@ -29,9 +29,10 @@ TARGET_CFLAGS := \
     -funwind-tables \
     -fstack-protector \
     -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ \
-    -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__
+    -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ \
+    -no-canonical-prefixes
 
-TARGET_LDFLAGS :=
+TARGET_LDFLAGS := -no-canonical-prefixes
 
 TARGET_C_INCLUDES := \
     $(SYSROOT)/usr/include
diff --git a/toolchains/arm-linux-androideabi-4.7/setup.mk b/toolchains/arm-linux-androideabi-4.7/setup.mk
index aaa1f088a..d6c2e884f 100644
--- a/toolchains/arm-linux-androideabi-4.7/setup.mk
+++ b/toolchains/arm-linux-androideabi-4.7/setup.mk
@@ -29,9 +29,10 @@ TARGET_CFLAGS := \
     -funwind-tables \
     -fstack-protector \
     -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ \
-    -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__
+    -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ \
+    -no-canonical-prefixes
 
-TARGET_LDFLAGS :=
+TARGET_LDFLAGS := -no-canonical-prefixes
 
 TARGET_C_INCLUDES := \
     $(SYSROOT)/usr/include
diff --git a/toolchains/arm-linux-androideabi-clang3.1/setup.mk b/toolchains/arm-linux-androideabi-clang3.1/setup.mk
index 282e2edb4..2a47cc2cf 100644
--- a/toolchains/arm-linux-androideabi-clang3.1/setup.mk
+++ b/toolchains/arm-linux-androideabi-clang3.1/setup.mk
@@ -53,10 +53,12 @@ TARGET_CFLAGS := \
     -funwind-tables \
     -fstack-protector \
     -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ \
-    -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__
+    -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ \
+    -no-canonical-prefixes
 
 TARGET_LDFLAGS := \
-    -gcc-toolchain $(call host-path,$(TOOLCHAIN_PREBUILT_ROOT))
+    -gcc-toolchain $(call host-path,$(TOOLCHAIN_PREBUILT_ROOT)) \
+    -no-canonical-prefixes
 
 TARGET_C_INCLUDES := \
     $(SYSROOT)/usr/include
diff --git a/toolchains/mipsel-linux-android-4.6/setup.mk b/toolchains/mipsel-linux-android-4.6/setup.mk
index 5aa74f9db..c764e9269 100644
--- a/toolchains/mipsel-linux-android-4.6/setup.mk
+++ b/toolchains/mipsel-linux-android-4.6/setup.mk
@@ -34,8 +34,9 @@ TARGET_CFLAGS := \
         -fgcse-after-reload \
         -frerun-cse-after-loop \
         -frename-registers \
+        -no-canonical-prefixes
 
-TARGET_LDFLAGS :=
+TARGET_LDFLAGS := -no-canonical-prefixes
 
 TARGET_C_INCLUDES := \
     $(SYSROOT)/usr/include
diff --git a/toolchains/mipsel-linux-android-4.7/setup.mk b/toolchains/mipsel-linux-android-4.7/setup.mk
index 6cdc1dee4..fbff3b031 100644
--- a/toolchains/mipsel-linux-android-4.7/setup.mk
+++ b/toolchains/mipsel-linux-android-4.7/setup.mk
@@ -34,8 +34,9 @@ TARGET_CFLAGS := \
         -fgcse-after-reload \
         -frerun-cse-after-loop \
         -frename-registers \
+        -no-canonical-prefixes
 
-TARGET_LDFLAGS :=
+TARGET_LDFLAGS := -no-canonical-prefixes
 
 TARGET_C_INCLUDES := \
     $(SYSROOT)/usr/include
diff --git a/toolchains/mipsel-linux-android-clang3.1/setup.mk b/toolchains/mipsel-linux-android-clang3.1/setup.mk
index b61b38c08..56115c561 100644
--- a/toolchains/mipsel-linux-android-clang3.1/setup.mk
+++ b/toolchains/mipsel-linux-android-clang3.1/setup.mk
@@ -56,11 +56,13 @@ TARGET_CFLAGS := \
         -finline-functions \
         -ffunction-sections \
         -funwind-tables \
-        -fmessage-length=0
+        -fmessage-length=0 \
+        -no-canonical-prefixes
 
 TARGET_LDFLAGS := \
         -gcc-toolchain $(call host-path,$(TOOLCHAIN_PREBUILT_ROOT)) \
-        -target $(LLVM_TRIPLE)
+        -target $(LLVM_TRIPLE) \
+        -no-canonical-prefixes
 
 TARGET_C_INCLUDES := \
     $(SYSROOT)/usr/include
diff --git a/toolchains/x86-4.6/setup.mk b/toolchains/x86-4.6/setup.mk
index 4b9b53fcc..c52bcad14 100644
--- a/toolchains/x86-4.6/setup.mk
+++ b/toolchains/x86-4.6/setup.mk
@@ -28,13 +28,14 @@ TOOLCHAIN_PREFIX := $(TOOLCHAIN_PREBUILT_ROOT)/bin/i686-linux-android-
 
 TARGET_CFLAGS := \
     -ffunction-sections \
-    -funwind-tables
+    -funwind-tables \
+    -no-canonical-prefixes
 
 TARGET_C_INCLUDES := \
     $(SYSROOT)/usr/include
 
 # Add and LDFLAGS for the target here
-# TARGET_LDFLAGS :=
+TARGET_LDFLAGS := -no-canonical-prefixes
 
 TARGET_CFLAGS += -fstack-protector
 
diff --git a/toolchains/x86-4.7/setup.mk b/toolchains/x86-4.7/setup.mk
index 46f2eb77a..da26fa351 100644
--- a/toolchains/x86-4.7/setup.mk
+++ b/toolchains/x86-4.7/setup.mk
@@ -28,13 +28,14 @@ TOOLCHAIN_PREFIX := $(TOOLCHAIN_PREBUILT_ROOT)/bin/i686-linux-android-
 
 TARGET_CFLAGS := \
     -ffunction-sections \
-    -funwind-tables
+    -funwind-tables \
+    -no-canonical-prefixes
 
 TARGET_C_INCLUDES := \
     $(SYSROOT)/usr/include
 
 # Add and LDFLAGS for the target here
-# TARGET_LDFLAGS :=
+TARGET_LDFLAGS := -no-canonical-prefixes
 
 TARGET_CFLAGS += -fstack-protector
 
diff --git a/toolchains/x86-clang3.1/setup.mk b/toolchains/x86-clang3.1/setup.mk
index ccfdbda99..40e3c08c7 100644
--- a/toolchains/x86-clang3.1/setup.mk
+++ b/toolchains/x86-clang3.1/setup.mk
@@ -50,7 +50,8 @@ TARGET_CFLAGS := \
     -ffunction-sections \
     -funwind-tables \
     -fstack-protector \
-    -fPIC
+    -fPIC \
+    -no-canonical-prefixes
 
 TARGET_C_INCLUDES := \
     $(SYSROOT)/usr/include
@@ -58,7 +59,8 @@ TARGET_C_INCLUDES := \
 # Add and LDFLAGS for the target here
 TARGET_LDFLAGS := \
     -gcc-toolchain $(call host-path,$(TOOLCHAIN_PREBUILT_ROOT)) \
-    -target $(LLVM_TRIPLE)
+    -target $(LLVM_TRIPLE) \
+    -no-canonical-prefixes
 
 TARGET_x86_release_CFLAGS := -O2 \
                              -g \