Commit 727a5522 authored by Rowenna Emma's avatar Rowenna Emma
Browse files

buildGraalvm: refactor use of --add-flags 

Simplifies the flag-handling code by using only one --add-flags,
rather than treating --add-flags like --add-flag by mapping it onto every flag
parent 483a5e7a

pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix

+3 −4
Original line number Diff line number Diff line
@@ -137,8 +137,8 @@ let 


      postInstall =

        let

          cLibsAsFlags = (map (l: "--add-flags '-H:CLibraryPath=${l}/lib'") cLibs);

          preservedNixVariables = [

          cLibsFlags = (map (l: "-H:CLibraryPath=${l}/lib") cLibs);

          preservedNixVarFlags = [

            "-ENIX_BINTOOLS"

            "-ENIX_BINTOOLS_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}"

            "-ENIX_BUILD_CORES"
@@ -161,7 +161,6 @@ let 
            "-EMACOSX_DEPLOYMENT_TARGET_FOR_TARGET"

            "-ENIX_APPLE_SDK_VERSION"

          ];

          preservedNixVariablesAsFlags = (map (f: "--add-flags '${f}'") preservedNixVariables);

        in

        ''

          # jni.h expects jni_md.h to be in the header search path.
@@ -182,7 +181,7 @@ let 


          wrapProgram $out/bin/native-image \

            --prefix PATH : ${binPath} \

            ${toString (cLibsAsFlags ++ preservedNixVariablesAsFlags)}

            --add-flags "${toString (cLibsFlags ++ preservedNixVarFlags)}"

        '';



      preFixup = lib.optionalString (stdenv.hostPlatform.isLinux) ''