提交 b7959667 编写于 作者: P prr

7078053: Solaris JDK build: C compiler writing tmp files into the make tree

Reviewed-by: ohair, alanb
上级 7c803c7d
...@@ -849,6 +849,7 @@ $(FILES_gensbcs_out): $(GENCSSRC)/SingleByte-X.java.template $(GENCSSRC)/sbcs ...@@ -849,6 +849,7 @@ $(FILES_gensbcs_out): $(GENCSSRC)/SingleByte-X.java.template $(GENCSSRC)/sbcs
GENUC_SRC = $(PLATFORM_SRC)/native/sun/nio/fs/genUnixConstants.c GENUC_SRC = $(PLATFORM_SRC)/native/sun/nio/fs/genUnixConstants.c
GENUC_OBJ = $(TEMPDIR)/genUnixConstants.o
GENUC_EXE = $(TEMPDIR)/genUnixConstants GENUC_EXE = $(TEMPDIR)/genUnixConstants
GENUC_COPYRIGHT_YEARS = $(shell $(CAT) $(GENUC_SRC) | \ GENUC_COPYRIGHT_YEARS = $(shell $(CAT) $(GENUC_SRC) | \
...@@ -856,7 +857,8 @@ GENUC_COPYRIGHT_YEARS = $(shell $(CAT) $(GENUC_SRC) | \ ...@@ -856,7 +857,8 @@ GENUC_COPYRIGHT_YEARS = $(shell $(CAT) $(GENUC_SRC) | \
$(GENUC_EXE) : $(GENUC_SRC) $(GENUC_EXE) : $(GENUC_SRC)
$(prep-target) $(prep-target)
$(CC) $(CPPFLAGS) -o $@ $(GENUC_SRC) $(CC) $(CPPFLAGS) -c -o $(GENUC_OBJ) $(GENUC_SRC)
$(CC) $(CPPFLAGS) -o $@ $(GENUC_OBJ)
ifdef NIO_PLATFORM_CLASSES_ROOT_DIR ifdef NIO_PLATFORM_CLASSES_ROOT_DIR
$(SFS_GEN)/UnixConstants.java: $(NIO_PLATFORM_CLASSES_ROOT_DIR)/sun/nio/fs/UnixConstants-$(PLATFORM)-$(ARCH).java $(SFS_GEN)/UnixConstants.java: $(NIO_PLATFORM_CLASSES_ROOT_DIR)/sun/nio/fs/UnixConstants-$(PLATFORM)-$(ARCH).java
...@@ -871,6 +873,7 @@ endif ...@@ -871,6 +873,7 @@ endif
GENSC_SRC = $(PLATFORM_SRC)/native/sun/nio/fs/genSolarisConstants.c GENSC_SRC = $(PLATFORM_SRC)/native/sun/nio/fs/genSolarisConstants.c
GENSC_OBJ = $(TEMPDIR)/genSolarisConstants.o
GENSC_EXE = $(TEMPDIR)/genSolarisConstants GENSC_EXE = $(TEMPDIR)/genSolarisConstants
GENSC_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSC_SRC) | \ GENSC_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSC_SRC) | \
...@@ -878,7 +881,8 @@ GENSC_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSC_SRC) | \ ...@@ -878,7 +881,8 @@ GENSC_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSC_SRC) | \
$(GENSC_EXE) : $(GENSC_SRC) $(GENSC_EXE) : $(GENSC_SRC)
$(prep-target) $(prep-target)
$(CC) $(CPPFLAGS) -o $@ $(GENSC_SRC) $(CC) $(CPPFLAGS) -c -o $(GENSC_OBJ) $(GENSC_SRC)
$(CC) $(CPPFLAGS) -o $@ $(GENSC_OBJ)
ifdef NIO_PLATFORM_CLASSES_ROOT_DIR ifdef NIO_PLATFORM_CLASSES_ROOT_DIR
$(SFS_GEN)/SolarisConstants.java: $(NIO_PLATFORM_CLASSES_ROOT_DIR)/sun/nio/fs/SolarisConstants-$(PLATFORM)-$(ARCH).java $(SFS_GEN)/SolarisConstants.java: $(NIO_PLATFORM_CLASSES_ROOT_DIR)/sun/nio/fs/SolarisConstants-$(PLATFORM)-$(ARCH).java
......
...@@ -251,9 +251,11 @@ XLIBTYPES=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/xlibtypes.txt ...@@ -251,9 +251,11 @@ XLIBTYPES=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/xlibtypes.txt
$(SIZERS): $(SIZERS_C) $(SIZERS): $(SIZERS_C)
$(prep-target) $(prep-target)
ifndef CROSS_COMPILE_ARCH ifndef CROSS_COMPILE_ARCH
$(CC) $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -o $@ $(SIZER)$(suffix $@).c $(CC) $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -c -o $(SIZER)$(suffix $@).o $(SIZER)$(suffix $@).c
$(CC) $(CFLAGS_$(subst .,,$(suffix $@))) -o $@ $(CPPFLAGS) $(SIZER)$(suffix $@).o
else else
$(HOST_CC) $(CPPFLAGS) -o $@ $(SIZER)$(suffix $@).c $(HOST_CC) $(CPPFLAGS) -c -o $(SIZER)$(suffix $@).o $(SIZER)$(suffix $@).c
$(HOST_CC) $(CPPFLAGS) -o $@ $(SIZER)$(suffix $@).o
endif endif
$(WRAPPER_GENERATOR_CLASS): $(WRAPPER_GENERATOR_JAVA) $(WRAPPER_GENERATOR_CLASS): $(WRAPPER_GENERATOR_JAVA)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册