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

Commits on Aug 9, 2016

  1. Copy the full SHA
    e11d21e View commit details
  2. Copy the full SHA
    8436804 View commit details
Showing with 11 additions and 2 deletions.
  1. +11 −2 tool/jt.rb
13 changes: 11 additions & 2 deletions tool/jt.rb
Original file line number Diff line number Diff line change
@@ -660,7 +660,6 @@ def cextc(cext_dir, *clang_opts)
end

config_file = File.join(cext_dir, '.jruby-cext-build.yml')

unless File.exist?(config_file)
abort "There is no .jruby-cext-build.yml in #{cext_dir} at the moment - I don't know how to build it"
end
@@ -670,10 +669,20 @@ def cextc(cext_dir, *clang_opts)

src = replace_env_vars(config['src'])
src = File.expand_path(src, cext_dir)
src = Dir[src]

config_cflags = config['cflags'] || ''
config_cflags = replace_env_vars(config_cflags)
config_cflags = config_cflags.split
# Expand include paths
config_cflags.map! { |cflag|
if cflag.start_with? '-I'
inc = File.expand_path(cflag[2..-1], cext_dir)
"-I#{inc}"
else
cflag
end
}

out = File.expand_path(config['out'], cext_dir)

@@ -689,7 +698,7 @@ def cextc(cext_dir, *clang_opts)
end

config_libs = config['libs'] || ''
config_libs = replace_env_vars(conf)
config_libs = replace_env_vars(config_libs)
config_libs = config_libs.split(' ')

if MAC