Merge changes Ie8ecb6c9,Ia9befd7c

* changes:
  Use relative paths in copygcclib.sh deps files
  Move -fno-canonical-system-headers to global cflags

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",

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