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: da784fd0235c
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d2beb01fe84e
Choose a head ref
  • 3 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 12, 2016

  1. [Truffle] Support -Dgraal options.

    @chrisseaton
    chrisseaton committed Jan 12, 2016
    Copy the full SHA
    712f62c View commit details

  2. Merge branch 'master' into truffle-head 

    # Conflicts:
#	bin/jruby.bash
    @chrisseaton
    chrisseaton committed Jan 12, 2016
    Copy the full SHA
    4c917bb View commit details

  3. [Truffle] Graal options are now -Dgraal. rather than -Dgraal.option.

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