diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2021-10-03 16:35:10 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2021-10-03 18:23:39 +0900 |
| commit | ea64e742f5feddbdfb6526cd0a54a9986097a34d (patch) | |
| tree | a767443410656381a98a744740c1a2ddf47ac817 | |
| parent | b91b3000bdb4e62fc059de709dbf9eb805c08d70 (diff) | |
Revert "mkmf.rb: try linking at try_var" [Bug #18235]
This reverts commit 524513be399e81bb170ec88aa0d501f33cbde8c3,
which can return false positive by existing but unusable symbol,
including functions.
| -rw-r--r-- | lib/mkmf.rb | 10 | ||||
| -rw-r--r-- | test/mkmf/test_have_var.rb | 17 |
2 files changed, 1 insertions, 26 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index cab9a3f646..79dd3f7172 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -821,21 +821,13 @@ SRC # You should use +have_var+ rather than +try_var+. def try_var(var, headers = nil, opt = "", &b) headers = cpp_include(headers) - try_compile(<<"SRC", opt, &b) or + try_compile(<<"SRC", opt, &b) #{headers} /*top*/ extern int t(void); #{MAIN_DOES_NOTHING 't'} int t(void) { const volatile void *volatile p; p = &(&#{var})[0]; return !p; } SRC - try_link(<<"SRC", opt, &b) -#{headers} -/*top*/ -extern int t(void); -#{MAIN_DOES_NOTHING 't'} -extern int #{var}; -int t(void) { const volatile void *volatile p; p = &(&#{var})[0]; return !p; } -SRC end # Returns whether or not the +src+ can be preprocessed with the C diff --git a/test/mkmf/test_have_var.rb b/test/mkmf/test_have_var.rb deleted file mode 100644 index 5367ec2248..0000000000 --- a/test/mkmf/test_have_var.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: false -require_relative 'base' -require 'tempfile' - -class TestMkmf - class TestHaveVar < TestMkmf - def test_have_var - assert_equal(true, have_var("ruby_version"), MKMFLOG) - assert_include($defs, '-DHAVE_RUBY_VERSION') - end - - def test_not_have_var - assert_equal(false, have_var("rb_vm_something_flag"), MKMFLOG) - assert_not_include($defs, '-DHAVE_RB_VM_SOMETHING_FLAG') - end - end -end |