Merge pull request #12568 from gebner/idea-openjdk8

idea: fix problems with openjdk8
This commit is contained in:
Edward Tjörnhammar
2016-01-24 10:29:54 +01:00
3 changed files with 9 additions and 9 deletions

View File

@@ -141,6 +141,11 @@ let
rm -rf $out/lib/openjdk/jre/bina
ln -s $out/lib/openjdk/bin $out/lib/openjdk/jre/bin
# Make sure cmm/*.pf are not symlinks:
# https://youtrack.jetbrains.com/issue/IDEA-147272
rm -rf $out/lib/openjdk/jre/lib/cmm
ln -s {$jre,$out}/lib/openjdk/jre/lib/cmm
# Set PaX markings
exes=$(file $out/lib/openjdk/bin/* $jre/lib/openjdk/jre/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')
echo "to mark: *$exes*"