Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-04-18 13:49:22 +00:00
parent 3e68106afd 0729f60697
commit d020caa5b2
1369 changed files with 35810 additions and 10571 deletions
@@ -956,7 +956,7 @@ following:
    phase.</para></listitem>
  </varlistentry>

-  <varlistentry>
+  <varlistentry xml:id="stdenv-separateDebugInfo">
    <term><varname>separateDebugInfo</varname></term>
    <listitem><para>If set to <literal>true</literal>, the standard
    environment will enable debug information in C/C++ builds. After