diff --git a/cc/config/global.go b/cc/config/global.go
index 7362f2e51..de4fa116c 100644
--- 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",
diff --git a/scripts/copygcclib.sh b/scripts/copygcclib.sh
index 93c52cc58..4bd6f9b47 100755
--- 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