make/Makefile

changeset 441
4325b440eb3e
parent 292
163f5d75f77a
child 462
aa06467be3a2
equal deleted inserted replaced
440:243d0be1ba99 441:4325b440eb3e
131 ifdef ALT_BOOTDIR 131 ifdef ALT_BOOTDIR
132 ANT_OPTIONS += -Dboot.java.home=$(ALT_BOOTDIR) 132 ANT_OPTIONS += -Dboot.java.home=$(ALT_BOOTDIR)
133 ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR) 133 ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
134 endif 134 endif
135 135
136 # To facilitate bootstrapping, much of langtools can be compiled with (just)
137 # a boot JDK. However, some source files need to be compiled against
138 # new JDK API. In a bootstrap build, an import JDK may not be available,
139 # so build.xml can also build against the source files in a jdk repo,
140 # in which case it will automatically generate stub files for the new JDK API.
141 ifdef JDK_TOPDIR
142 ANT_OPTIONS += -Dimport.jdk=$(JDK_TOPDIR)
143 else
144 ifdef ALT_JDK_TOPDIR
145 ANT_OPTIONS += -Dimport.jdk=$(ALT_JDK_TOPDIR)
146 else
147 ifdef ALT_JDK_IMPORT_DIR
148 ANT_OPTIONS += -Dimport.jdk=$(ALT_JDK_IMPORT_DIR)
149 endif
150 endif
151 endif
152
136 ifdef ALT_OUTPUTDIR 153 ifdef ALT_OUTPUTDIR
137 OUTPUTDIR = $(ALT_OUTPUTDIR) 154 OUTPUTDIR = $(ALT_OUTPUTDIR)
138 ANT_OPTIONS += -Dbuild.dir=$(ALT_OUTPUTDIR)/build 155 ANT_OPTIONS += -Dbuild.dir=$(ALT_OUTPUTDIR)/build
139 ANT_OPTIONS += -Ddist.dir=$(ALT_OUTPUTDIR)/dist 156 ANT_OPTIONS += -Ddist.dir=$(ALT_OUTPUTDIR)/dist
140 else 157 else

mercurial