Fix unsafe mock bootstrapping in compile.

jruby · Jul 5, 2015 · 4237631 · 4237631
1 parent 7b2bf65
commit 4237631
Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/core/pom.rb b/core/pom.rb
@@ -157,7 +157,10 @@
           'debug' => 'true',
           'verbose' => 'true',
           'fork' => 'true',
-          'compilerArgs' => { 'arg' => '-J-Xmx1G' },
+          'compilerArgs' => {
+              'arg' => '-J-Xmx1G',
+              'arg' => '-J-Xbootclasspath/p:${unsafe.jar}'
+          },
           'showWarnings' => 'true',
           'showDeprecation' => 'true',
           'source' => [ '${base.java.version}', '1.7' ],
@@ -196,6 +199,11 @@
     execute_goals( 'compile',
                    :id => 'eclipse-hack',
                    :phase => 'process-classes',
+                   'compilerArgs' => [ '-XDignore.symbol.file=true',
+                                       '-J-Duser.language=en',
+                                       '-J-Dfile.encoding=UTF-8',
+                                       '-J-Xbootclasspath/p:${unsafe.jar}',
+                                       '-J-Xmx${jruby.compile.memory}' ],
                    'skipMain' =>  'true',
                    'includes' => [ '**/*.java' ] )
   end

diff --git a/core/pom.xml b/core/pom.xml
@@ -404,6 +404,13 @@ DO NOT MODIFIY - GENERATED CODE
               <goal>compile</goal>
             </goals>
             <configuration>
+              <compilerArgs>
+                <compilerArg>-XDignore.symbol.file=true</compilerArg>
+                <compilerArg>-J-Duser.language=en</compilerArg>
+                <compilerArg>-J-Dfile.encoding=UTF-8</compilerArg>
+                <compilerArg>-J-Xbootclasspath/p:${unsafe.jar}</compilerArg>
+                <compilerArg>-J-Xmx${jruby.compile.memory}</compilerArg>
+              </compilerArgs>
               <skipMain>true</skipMain>
               <includes>
                 <include>**/*.java</include>
@@ -417,7 +424,7 @@ DO NOT MODIFIY - GENERATED CODE
           <verbose>true</verbose>
           <fork>true</fork>
           <compilerArgs>
-            <arg>-J-Xmx1G</arg>
+            <arg>-J-Xbootclasspath/p:${unsafe.jar}</arg>
           </compilerArgs>
           <showWarnings>true</showWarnings>
           <showDeprecation>true</showDeprecation>