Merge remote-tracking branch 'upstream/master' into HEAD

2017-07-30 08:09:11 +02:00
parent 69e24c044a 9ea8535fa7
commit 20b8e4b4cf
37 changed files with 281 additions and 119 deletions
@@ -97,6 +97,7 @@ let
      chmod +x configure
      substituteInPlace configure --replace /bin/bash "$shell"
      substituteInPlace hotspot/make/linux/adlc_updater --replace /bin/sh "$shell"
+      substituteInPlace hotspot/make/linux/makefiles/dtrace.make --replace /usr/include/sys/sdt.h "/no-such-path"
    '';

    configureFlags = [