Revert "Revert "Remove some vestiges of the old C extension support t…

…hat don't do anything."" This reverts commit dc702bd.
jruby · Nov 19, 2014 · fd87e0b · fd87e0b
1 parent b6ac4c4
commit fd87e0b
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 118 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,9 +13,8 @@ os:
   - osx
 
 env:
-  # disable cext
   global:
-    - JAVA_OPTS="-XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Djruby.cext.enabled=false"
+    - JAVA_OPTS="-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
   matrix:
     - TARGET='-Ptest'
     - TARGET='-Pjruby_complete_jar_jruby'

diff --git a/core/src/main/java/org/jruby/runtime/load/CExtension.java b/core/src/main/java/org/jruby/runtime/load/CExtension.java
diff --git a/core/src/main/java/org/jruby/util/cli/Options.java b/core/src/main/java/org/jruby/util/cli/Options.java
@@ -253,8 +253,6 @@ public static String dump() {
 
     // After PROPERTIES so it doesn't show up in --properties
     @Deprecated
-    public static final Option<Boolean> CEXT_ENABLED = bool(NATIVE, "cext.enabled", false, "Enable or disable C extension support.");
-    @Deprecated
     public static final Option<Boolean> JIT_CACHE = bool(JIT, "jit.cache", !COMPILE_INVOKEDYNAMIC.load(), "(DEPRECATED) Cache jitted method in-memory bodies across runtimes and loads.");
 
     private static Option<String> string(Category category, String name, String[] options, String defval, String description) {