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

Commits on Nov 27, 2016

  1. Copy the full SHA
    fcf8304 View commit details
  2. Copy the full SHA
    04e6092 View commit details
  3. Copy the full SHA
    144edfe View commit details
  4. Copy the full SHA
    9bb8e92 View commit details
4 changes: 0 additions & 4 deletions test/truffle/cexts/ruby-argon2/test.rb

This file was deleted.

4 changes: 2 additions & 2 deletions test/truffle/cexts/xml/ext/xml/extconf.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'mkmf'
$CFLAGS += " -I#{ENV['LIBXML_INCLUDE']}"
$LDFLAGS += " -l #{ENV['LIBXML_LIB']}"
$CFLAGS += " -I #{ENV['LIBXML_INCLUDE']}"
$LIBS += " -l #{ENV['LIBXML_LIB']}"
create_makefile('xml')
4 changes: 2 additions & 2 deletions test/truffle/cexts/xopenssl/ext/xopenssl/extconf.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'mkmf'
$CFLAGS += " -I#{ENV['OPENSSL_INCLUDE']}"
$LDFLAGS += " -l #{ENV['OPENSSL_LIB']}"
$CFLAGS += " -I #{ENV['OPENSSL_INCLUDE']}"
$LIBS += " -l #{ENV['OPENSSL_LIB']}"
create_makefile('xopenssl')
1 change: 0 additions & 1 deletion truffle/src/main/c/cext/extconf.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
require 'mkmf'
# $CFLAGS += " -Wall -Werror" # we are currently adding these by default
create_makefile('ruby')
4 changes: 2 additions & 2 deletions truffle/src/main/c/openssl/extconf.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'mkmf'
$CFLAGS += " -I#{ENV['OPENSSL_INCLUDE']} -DHAVE_OPENSSL_110_THREADING_API -DHAVE_HMAC_CTX_COPY -DHAVE_EVP_CIPHER_CTX_COPY -DHAVE_BN_RAND_RANGE -DHAVE_BN_PSEUDO_RAND_RANGE -DHAVE_X509V3_EXT_NCONF_NID"
$LDFLAGS += " -l #{ENV['OPENSSL_LIB']}"
$CFLAGS += " -I #{ENV['OPENSSL_INCLUDE']} -DHAVE_OPENSSL_110_THREADING_API -DHAVE_HMAC_CTX_COPY -DHAVE_EVP_CIPHER_CTX_COPY -DHAVE_BN_RAND_RANGE -DHAVE_BN_PSEUDO_RAND_RANGE -DHAVE_X509V3_EXT_NCONF_NID"
$LIBS += " -l #{ENV['OPENSSL_LIB']}"
create_makefile('openssl')
4 changes: 2 additions & 2 deletions truffle/src/main/ruby/core/rbconfig.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2014, 2015 Oracle and/or its affiliates. All rights reserved. This
# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved. This
# code is released under a tri EPL/GPL/LGPL license. You can use it,
# redistribute it and/or modify it under the terms of the:
#
@@ -105,7 +105,7 @@ module RbConfig
'CPP' => cpp,
'COMPILE_C' => "$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$< -o $@ && #{opt} -S -always-inline -mem2reg $@ -o $@",
'CFLAGS' => "-emit-llvm",
'LINK_SO' => "mx -v -p #{ENV['SULONG_HOME']} su-link -o $@ $(OBJS)",
'LINK_SO' => "mx -v -p #{ENV['SULONG_HOME']} su-link -o $@ $(OBJS) $(LIBS)",
'TRY_LINK' => "#{clang} $(src) $(INCFLAGS) $(CFLAGS) -I#{ENV['SULONG_HOME']}/include $(LIBS)"
})