Mercurial > hg > truffle
comparison make/windows/makefiles/rules.make @ 971:0fc81f0a8ca8
6873059: Explicitly use -source 6 -target 6 when compiling with the boot jdk
Summary: The build fails if the bootstrap JDK defaults to <1.5
Reviewed-by: jcoomes
author | andrew |
---|---|
date | Sat, 12 Sep 2009 12:50:07 +0100 |
parents | bd02caa94611 |
children | c18cbe5936b8 |
comparison
equal
deleted
inserted
replaced
970:682194ca1d8d | 971:0fc81f0a8ca8 |
---|---|
27 !ifdef BootStrapDir | 27 !ifdef BootStrapDir |
28 RUN_JAVA=$(BootStrapDir)\bin\java | 28 RUN_JAVA=$(BootStrapDir)\bin\java |
29 RUN_JAVAP=$(BootStrapDir)\bin\javap | 29 RUN_JAVAP=$(BootStrapDir)\bin\javap |
30 RUN_JAVAH=$(BootStrapDir)\bin\javah | 30 RUN_JAVAH=$(BootStrapDir)\bin\javah |
31 RUN_JAR=$(BootStrapDir)\bin\jar | 31 RUN_JAR=$(BootStrapDir)\bin\jar |
32 COMPILE_JAVAC=$(BootStrapDir)\bin\javac | 32 COMPILE_JAVAC=$(BootStrapDir)\bin\javac $(BOOTSTRAP_JAVAC_FLAGS) |
33 COMPILE_RMIC=$(BootStrapDir)\bin\rmic | 33 COMPILE_RMIC=$(BootStrapDir)\bin\rmic |
34 BOOT_JAVA_HOME=$(BootStrapDir) | 34 BOOT_JAVA_HOME=$(BootStrapDir) |
35 !else | 35 !else |
36 RUN_JAVA=java | 36 RUN_JAVA=java |
37 RUN_JAVAP=javap | 37 RUN_JAVAP=javap |
38 RUN_JAVAH=javah | 38 RUN_JAVAH=javah |
39 RUN_JAR=jar | 39 RUN_JAR=jar |
40 COMPILE_JAVAC=javac | 40 COMPILE_JAVAC=javac $(BOOTSTRAP_JAVAC_FLAGS) |
41 COMPILE_RMIC=rmic | 41 COMPILE_RMIC=rmic |
42 BOOT_JAVA_HOME= | 42 BOOT_JAVA_HOME= |
43 !endif | 43 !endif |
44 | |
45 # Settings for javac | |
46 BOOT_SOURCE_LANGUAGE_VERSION=6 | |
47 BOOT_TARGET_CLASS_VERSION=6 | |
48 JAVAC_FLAGS=-g -encoding ascii | |
49 BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION) | |
44 | 50 |
45 ProjectFile=vm.vcproj | 51 ProjectFile=vm.vcproj |
46 | 52 |
47 !if "$(MSC_VER)" == "1200" | 53 !if "$(MSC_VER)" == "1200" |
48 | 54 |