--- a/mx/mx_graal.py	Tue May 26 16:44:24 2015 -0700
+++ b/mx/mx_graal.py	Tue May 26 17:38:44 2015 -0700
@@ -37,6 +37,7 @@
 import itertools
 import json, textwrap
 import fnmatch
+import mx_graal_makefile
 
 # This works because when mx loads this file, it makes sure __file__ gets an absolute path
 _graal_home = dirname(dirname(__file__))
@@ -1752,6 +1753,7 @@
     parser = ArgumentParser(prog='mx gate')
     parser.add_argument('-j', '--omit-java-clean', action='store_false', dest='cleanJava', help='omit cleaning Java native code')
     parser.add_argument('-n', '--omit-native-clean', action='store_false', dest='cleanNative', help='omit cleaning and building native code')
+    parser.add_argument('-i', '--omit-ide-clean', action='store_false', dest='cleanIde', help='omit cleaning the ide project files')
     parser.add_argument('-g', '--only-build-graalvm', action='store_false', dest='buildNonGraal', help='only build the Graal VM')
     parser.add_argument('-t', '--task-filter', help='comma separated list of substrings to select subset of tasks to be run')
     parser.add_argument('--jacocout', help='specify the output directory for jacoco report')
@@ -1784,10 +1786,11 @@
                     clean(cleanArgs)
         _clean()
 
-        with Task('IDEConfigCheck', tasks):
+        with Task('IDEConfigCheck', tasks) as t:
             if t:
-                mx.ideclean([])
-                mx.ideinit([])
+                if args.cleanIde:
+                    mx.ideclean([])
+                    mx.ideinit([])
 
         eclipse_exe = mx.get_env('ECLIPSE_EXE')
         if eclipse_exe is not None:
@@ -2660,6 +2663,7 @@
         'sl' : [sl, '[SL args|@VM options]'],
         'sldebug' : [sldebug, '[SL args|@VM options]'],
         'jol' : [jol, ''],
+        'makefile' : [mx_graal_makefile.build_makefile, 'build makefiles for JDK build'],
     }
 
     mx.add_argument('--jacoco', help='instruments com.oracle.* classes using JaCoCo', default='off', choices=['off', 'on', 'append'])