diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/FastRConfig.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/FastRConfig.java index 6aef3d709ecc220de7b17f08f4e58e58cb5ab9e1..8d6bbf8f1bf32640ec626bed909b96e80c31e37f 100644 --- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/FastRConfig.java +++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/FastRConfig.java @@ -38,7 +38,12 @@ public final class FastRConfig { static { String managedModeVal = System.getenv("FASTR_MANAGED"); ManagedMode = managedModeVal != null && managedModeVal.equals("true"); - InternalGridAwtSupport = !ManagedMode; + if (ManagedMode) { + InternalGridAwtSupport = false; + } else { + String val = System.getProperty("fastr.internal.grid.awt.support"); + InternalGridAwtSupport = val == null || val.equals("true"); + } } private FastRConfig() {