equal
deleted
inserted
replaced
283 # Necessary additional compiler flags to compile X11 |
283 # Necessary additional compiler flags to compile X11 |
284 X_CFLAGS:=@X_CFLAGS@ |
284 X_CFLAGS:=@X_CFLAGS@ |
285 X_LIBS:=@X_LIBS@ |
285 X_LIBS:=@X_LIBS@ |
286 OPENWIN_HOME:=@OPENWIN_HOME@ |
286 OPENWIN_HOME:=@OPENWIN_HOME@ |
287 |
287 |
|
288 # The lowest required version of macosx to enforce compatiblity for |
|
289 MACOSX_REQUIRED_VERSION=@MACOSX_REQUIRED_VERSION@ |
|
290 |
288 # There are two types: CC or CL |
291 # There are two types: CC or CL |
289 # CC is gcc and others behaving reasonably similar. |
292 # CC is gcc and others behaving reasonably similar. |
290 # CL is cl.exe only. |
293 # CL is cl.exe only. |
291 COMPILER_TYPE:=@COMPILER_TYPE@ |
294 COMPILER_TYPE:=@COMPILER_TYPE@ |
292 |
295 |
434 RMIC=@FIXPATH@ $(BOOT_JDK)/bin/rmic |
437 RMIC=@FIXPATH@ $(BOOT_JDK)/bin/rmic |
435 |
438 |
436 NATIVE2ASCII=@FIXPATH@ $(BOOT_JDK)/bin/native2ascii |
439 NATIVE2ASCII=@FIXPATH@ $(BOOT_JDK)/bin/native2ascii |
437 |
440 |
438 JARSIGNER=@FIXPATH@ $(BOOT_JDK)/bin/jarsigner |
441 JARSIGNER=@FIXPATH@ $(BOOT_JDK)/bin/jarsigner |
|
442 |
|
443 # You run the new javac using the boot jdk with $(BOOT_JDK)/bin/java $(NEW_JAVAC) ... |
|
444 BOOTSTRAP_JAVAC_JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar |
|
445 BOOTSTRAP_JAVAC_ARGS:="-Xbootclasspath/p:$(BOOTSTRAP_JAVAC_JAR)" -cp $(BOOTSTRAP_JAVAC_JAR) |
|
446 NEW_JAVAC = $(BOOTSTRAP_JAVAC_ARGS) com.sun.tools.javac.Main |
|
447 NEW_JAVADOC = $(BOOTSTRAP_JAVAC_ARGS) com.sun.tools.javadoc.Main |
439 |
448 |
440 # Base flags for RC |
449 # Base flags for RC |
441 # Guarding this against resetting value. Legacy make files include spec multiple |
450 # Guarding this against resetting value. Legacy make files include spec multiple |
442 # times. |
451 # times. |
443 ifndef RC_FLAGS |
452 ifndef RC_FLAGS |