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

Commits on Nov 15, 2016

  1. Copy the full SHA
    b88b189 View commit details
  2. 2
    Copy the full SHA
    60a5888 View commit details
Showing with 5 additions and 1 deletion.
  1. +4 −0 truffle/src/main/ruby/core/post.rb
  2. +1 −1 truffle/src/main/ruby/core/signal.rb
4 changes: 4 additions & 0 deletions truffle/src/main/ruby/core/post.rb
Original file line number Diff line number Diff line change
@@ -50,6 +50,10 @@ def self.const_exists?(mod, name, inherit = true)
$LOAD_PATH.push *Truffle::Boot.original_load_path

home = Truffle::Boot.jruby_home_directory_protocol
# Does not exist but it's used by rubygems to determine index where to insert gem lib directories, as a result
# paths supplied by -I will stay before gem lib directories.
$LOAD_PATH.push home + '/lib/ruby/2.3/site_ruby'

$LOAD_PATH.push home + '/lib/ruby/truffle/mri'
$LOAD_PATH.push home + '/lib/ruby/truffle/rubysl/rubysl-strscan/lib'
$LOAD_PATH.push home + '/lib/ruby/truffle/rubysl/rubysl-stringio/lib'
2 changes: 1 addition & 1 deletion truffle/src/main/ruby/core/signal.rb
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@ module Signal
remove_const :SIGNAL_LIST

# replace CLD with CHLD since CLD is not recognized by in `new sun.misc.Signal("CLD")`
Numbers[Names['CLD']] = Numbers[Names['CHLD']]
Numbers[Names['CHLD']] = 'CHLD'

@threads = {}
@handlers = {}