Merge changes Ie8ecb6c9,Ia9befd7c am: a632e9f4d2

am: 0ced97e7f1 Change-Id: Ie512bf688ddc79699ebab9591b2baa310993d12a
2017-11-06 23:18:48 +00:00
parent 46695ac392 0ced97e7f1
commit 354b878e31
2 changed files with 2 additions and 2 deletions
--- a/cc/config/global.go
+++ b/cc/config/global.go
@@ -36,6 +36,7 @@ var (

 		// Make paths in deps files relative
 		"-no-canonical-prefixes",
+		"-fno-canonical-system-headers",

 		"-DNDEBUG",
 		"-UDEBUG",
@@ -54,7 +55,6 @@ var (
 	deviceGlobalCflags = []string{
 		"-fdiagnostics-color",

-		"-fno-canonical-system-headers",
 		"-ffunction-sections",
 		"-funwind-tables",
 		"-fstack-protector-strong",
--- a/scripts/copygcclib.sh
+++ b/scripts/copygcclib.sh
@@ -2,6 +2,6 @@

 OUT=$1
 shift
-LIBPATH=$($@)
+LIBPATH=$($@ | sed -e "s|^$PWD/||")
 cp -f $LIBPATH $OUT
 echo "$OUT: $LIBPATH" > ${OUT}.d