Merge remote-tracking branch 'origin/master' into staging.

2015-02-25 20:18:28 +01:00
parent 3021f2f529 9788cbb2de
commit d6c295e469
121 changed files with 14483 additions and 2729 deletions
@@ -5,14 +5,6 @@ stdenv.mkDerivation rec {

  src = fetch "dragonegg" "1v1lc9h2nfk3lsk9sx1k4ckwddz813hqjmlp2bx2kwxx9hw364ar";

-  patches = [(fetchpatch {
-    url = "https://llvm.org/viewvc/llvm-project/dragonegg/trunk/src/x86/ABIHack.inc"
-      + "?r1=208730&r2=208729&view=patch";
-    sha256 = "1al82gqz90hzjx24p0wls029lw2bgnlgd209kgvxsp82p4z1v1c1";
-    name = "bug-18548.patch";
-  })];
-  patchFlags = "-p2";
-
  # The gcc the plugin will be built for (the same used building dragonegg)
  GCC = "gcc";