Merge branch 'staging' into gcc-7

I'm betting Hydra resources on gcc-7 getting to master before current staging.
2018-02-19 15:24:32 +01:00
parent 0c8939b5fb 7e70afc6ff
commit 882062004b
77 changed files with 294 additions and 223 deletions
@@ -866,7 +866,7 @@ unpackPhase() {
    # necessary when sources have been copied from other store
    # locations.
    if [ "${dontMakeSourcesWritable:-0}" != 1 ]; then
-        chmod -R u+w "$sourceRoot"
+        chmod -R u+w -- "$sourceRoot"
    fi

    runHook postUnpack