Merge branch 'master' into staging-next

Comments on conflicts: - llvm: d6f401e1 vs. 469ecc70 - docs for 6 and 7 say the default is to build all targets, so we should be fine - some pypi hashes: they were equivalent, just base16 vs. base32
2019-02-01 09:22:29 +01:00
parent ca2edf79f7 8f58e00226
commit 5effa4e0f9
974 changed files with 16880 additions and 9001 deletions
@@ -2,4 +2,3 @@
 getHostRole

 export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem $(echo -n @gcc@/include/c++/*) -isystem $(echo -n @gcc@/include/c++/*)/$(@gcc@/bin/gcc -dumpmachine)"
-export NIX_${role_pre}CXXSTDLIB_LINK=" -stdlib=libstdc++"