From cb70413e8d77885bc973bd56146fbf324bf52d91 Mon Sep 17 00:00:00 2001 From: Evan Phoenix Date: Tue, 29 Jul 2008 14:42:22 -0700 Subject: [PATCH] Change soft-fail to use the config, rather than env --- kernel/platform/ffi.rb | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/kernel/platform/ffi.rb b/kernel/platform/ffi.rb index c09fee518..356f8691e 100644 --- a/kernel/platform/ffi.rb +++ b/kernel/platform/ffi.rb @@ -241,12 +241,12 @@ class Module end STDOUT.write " could not be found or linked.\n" - if env "RBX_FFI_SOFTFAIL" - STDOUT.write "*** Proceeding because RBX_FFI_SOFTFAIL is set. Program may fail later.\n" + if Rubinius::RUBY_CONFIG["rbx.ffi.soft_fail"] + STDOUT.write "*** Proceeding because rbx.ffi.soft_fail is set. Program may fail later.\n" return nil else - STDOUT.write "*** If you want to try to work around this problem, you may set environment\n" - STDOUT.write "*** variable RBX_FFI_SOFTFAIL.\n" + STDOUT.write "*** If you want to try to work around this problem, you may set configuration\n" + STDOUT.write "*** variable rbx.ffi.soft_fail.\n" STDOUT.write "*** Exiting.\n" Process.exit 1 end @@ -275,11 +275,6 @@ class Module metaclass.method_table[mname] = func return func end - - # HACK: Unable to get EnvironmentVariables up at this point - def env(str) - Ruby.primitive :env_get - end end ## -- 2.11.4.GIT