Remove the --cexts-prepend-toolchain-to-path option

* It's only relevant when using the LLVM toolchain.

Author: eregon

lib/mri/mkmf.rb

@@ -48,10 +48,6 @@
   end
 end
 
-if defined?(::TruffleRuby) and Truffle::Boot.get_option('cexts-prepend-toolchain-to-path') and Truffle::Boot.get_option('cexts-sulong')
-  ENV['PATH'] = "#{RbConfig::CONFIG['toolchain_path']}:#{ENV['PATH']}"
-end
-
 class String # :nodoc:
   # Wraps a string in escaped quotes if it contains whitespace.
   def quote

src/main/java/org/truffleruby/options/Options.java

@@ -109,8 +109,6 @@ public final class Options {
     public final boolean CEXTS;
     /** --cexts-lock=true */
     public final boolean CEXT_LOCK;
-    /** --cexts-prepend-toolchain-to-path=true */
-    public final boolean CEXTS_PREPEND_TOOLCHAIN_TO_PATH;
     /** --options-log=false */
     public final boolean OPTIONS_LOG;
     /** --log-load=false */
@@ -255,7 +253,6 @@ public Options(Env env, OptionValues options, LanguageOptions languageOptions) {
         BACKTRACE_ON_NEW_FIBER = options.get(OptionsCatalog.BACKTRACE_ON_NEW_FIBER_KEY);
         CEXTS = options.get(OptionsCatalog.CEXTS_KEY);
         CEXT_LOCK = options.get(OptionsCatalog.CEXT_LOCK_KEY);
-        CEXTS_PREPEND_TOOLCHAIN_TO_PATH = options.get(OptionsCatalog.CEXTS_PREPEND_TOOLCHAIN_TO_PATH_KEY);
         OPTIONS_LOG = options.get(OptionsCatalog.OPTIONS_LOG_KEY);
         LOG_LOAD = options.get(OptionsCatalog.LOG_LOAD_KEY);
         LOG_AUTOLOAD = options.get(OptionsCatalog.LOG_AUTOLOAD_KEY);
@@ -394,8 +391,6 @@ public Object fromDescriptor(OptionDescriptor descriptor) {
                 return CEXTS;
             case "ruby.cexts-lock":
                 return CEXT_LOCK;
-            case "ruby.cexts-prepend-toolchain-to-path":
-                return CEXTS_PREPEND_TOOLCHAIN_TO_PATH;
             case "ruby.options-log":
                 return OPTIONS_LOG;
             case "ruby.log-load":

src/options.yml

@@ -129,7 +129,6 @@ EXPERT:
     # C extension options
     CEXTS: [cexts, boolean, true, Enable use of C extensions]
     CEXT_LOCK: [cexts-lock, boolean, true, Use a Global Lock when running C extensions]
-    CEXTS_PREPEND_TOOLCHAIN_TO_PATH: [cexts-prepend-toolchain-to-path, boolean, true, Prepend the GraalVM LLVM Toolchain to PATH when installing gems]
 
     # Debugging the values of options
     OPTIONS_LOG: [options-log, boolean, false, Log the final value of all options]

src/shared/java/org/truffleruby/shared/options/OptionsCatalog.java

@@ -72,7 +72,6 @@ public final class OptionsCatalog {
     public static final OptionKey<Boolean> BACKTRACE_ON_NEW_FIBER_KEY = new OptionKey<>(false);
     public static final OptionKey<Boolean> CEXTS_KEY = new OptionKey<>(true);
     public static final OptionKey<Boolean> CEXT_LOCK_KEY = new OptionKey<>(true);
-    public static final OptionKey<Boolean> CEXTS_PREPEND_TOOLCHAIN_TO_PATH_KEY = new OptionKey<>(true);
     public static final OptionKey<Boolean> OPTIONS_LOG_KEY = new OptionKey<>(false);
     public static final OptionKey<Boolean> LOG_LOAD_KEY = new OptionKey<>(false);
     public static final OptionKey<Boolean> LOG_AUTOLOAD_KEY = new OptionKey<>(false);
@@ -583,14 +582,6 @@ public final class OptionsCatalog {
             .usageSyntax("")
             .build();
 
-    public static final OptionDescriptor CEXTS_PREPEND_TOOLCHAIN_TO_PATH = OptionDescriptor
-            .newBuilder(CEXTS_PREPEND_TOOLCHAIN_TO_PATH_KEY, "ruby.cexts-prepend-toolchain-to-path")
-            .help("Prepend the GraalVM LLVM Toolchain to PATH when installing gems")
-            .category(OptionCategory.EXPERT)
-            .stability(OptionStability.EXPERIMENTAL)
-            .usageSyntax("")
-            .build();
-
     public static final OptionDescriptor OPTIONS_LOG = OptionDescriptor
             .newBuilder(OPTIONS_LOG_KEY, "ruby.options-log")
             .help("Log the final value of all options")
@@ -1441,8 +1432,6 @@ public static OptionDescriptor fromName(String name) {
                 return CEXTS;
             case "ruby.cexts-lock":
                 return CEXT_LOCK;
-            case "ruby.cexts-prepend-toolchain-to-path":
-                return CEXTS_PREPEND_TOOLCHAIN_TO_PATH;
             case "ruby.options-log":
                 return OPTIONS_LOG;
             case "ruby.log-load":
@@ -1688,7 +1677,6 @@ public static OptionDescriptor[] allDescriptors() {
             BACKTRACE_ON_NEW_FIBER,
             CEXTS,
             CEXT_LOCK,
-            CEXTS_PREPEND_TOOLCHAIN_TO_PATH,
             OPTIONS_LOG,
             LOG_LOAD,
             LOG_AUTOLOAD,