* pcre: don't compile with C++ support when doing a dietlibc build.

* GCC 4.2: restore the ability to build a statically linked compiler,
  needed for the Nixpkgs bootstrap.
* GCC 4.2: use symlinks instead of hard links in $out/bin
  (NIXPKGS-62).

svn path=/nixpkgs/branches/stdenv-updates/; revision=9771

pkgs/development/libraries/pcre/default.nix

@@ -1,4 +1,4 @@
-args: with args;
+{stdenv, fetchurl, unicodeSupport ? false, cplusplusSupport ? true}:
 
 stdenv.mkDerivation {
   name = "pcre-7.4";
@@ -7,7 +7,8 @@ stdenv.mkDerivation {
     sha256 = "1rdks2h5f3p2d71c4jnxaic1c9gmgsfky80djnafcdbdrhzkiyx5";
   };
   configureFlags =
-    if unicodeSupport then
+    (if unicodeSupport then
       "--enable-unicode-properties --enable-shared --disable-static"
-    else "";
+    else "") +
+    (if !cplusplusSupport then "--disable-cpp" else "");
 }