Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2f3bbdcb991a
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5bac239a144d
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Feb 2, 2016

  1. [Truffle] Revert accidental merge of new Graal options format.

    @chrisseaton
    chrisseaton committed Feb 2, 2016
    Copy the full SHA
    5bac239 View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 bin/jruby.bash
8 changes: 4 additions & 4 deletions bin/jruby.bash
View file
Original file line number Diff line number Diff line change
@@ -234,16 +234,16 @@ do
-*)
opt="${opt:1}=false" ;;
esac
java_args=("${java_args[@]}" "-Dgraal.$opt")
java_args=("${java_args[@]}" "-Djvmci.option.$opt")
elif [ "${val:0:15}" = "-Djvmci.option." ]; then # Graal options
opt=${val:15}
java_args=("${java_args[@]}" "-Dgraal.$opt")
java_args=("${java_args[@]}" "-Djvmci.option.$opt")
elif [ "${val:0:15}" = "-Dgraal.option." ]; then # Graal options
opt=${val:15}
java_args=("${java_args[@]}" "-Dgraal.$opt")
java_args=("${java_args[@]}" "-Djvmci.option.$opt")
elif [ "${val:0:8}" = "-Dgraal." ]; then # Graal options
opt=${val:8}
java_args=("${java_args[@]}" "-Dgraal.$opt")
java_args=("${java_args[@]}" "-Djvmci.option.$opt")
else
if [ "${val:0:3}" = "-ea" ]; then
VERIFY_JRUBY="yes"