1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
|
diff --git openjdk/jdk/make/java/nio/Makefile openjdk/jdk/make/java/nio/Makefile
index 7906531..afa5d46 100644
--- openjdk/jdk/make/java/nio/Makefile
+++ openjdk/jdk/make/java/nio/Makefile
@@ -823,7 +823,7 @@ $(TEMPDIR)/$(GENSOR_SRC) : $(GENSOR_SRC)
$(GENSOR_EXE) : $(TEMPDIR)/$(GENSOR_SRC)
$(prep-target)
- ($(CD) $(TEMPDIR); $(CC) $(CPPFLAGS) $(LDDFLAGS) \
+ ($(CD) $(TEMPDIR); $(CC_FOR_BUILD) $(CPPFLAGS) $(LDDFLAGS) \
-o genSocketOptionRegistry$(EXE_SUFFIX) $(GENSOR_SRC))
ifdef NIO_PLATFORM_CLASSES_ROOT_DIR
@@ -834,12 +834,8 @@ else
$(SCH_GEN)/SocketOptionRegistry.java: $(GENSOR_EXE)
$(prep-target)
NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(SOR_COPYRIGHT_YEARS)" > $@
-ifdef CROSS_COMPILE_ARCH
- $(QEMU) $(GENSOR_EXE) >> $@
-else
$(GENSOR_EXE) >> $@
endif
-endif
#
# Generated sun.nio.cs SingleByte classes
#
@@ -863,7 +859,7 @@ GENUC_COPYRIGHT_YEARS = $(shell $(CAT) $(GENUC_SRC) | \
$(GENUC_EXE) : $(GENUC_SRC)
$(prep-target)
- $(CC) $(CPPFLAGS) -o $@ $(GENUC_SRC)
+ $(CC_FOR_BUILD) $(CPPFLAGS) -o $@ $(GENUC_SRC)
ifdef NIO_PLATFORM_CLASSES_ROOT_DIR
$(SFS_GEN)/UnixConstants.java: $(NIO_PLATFORM_CLASSES_ROOT_DIR)/sun/nio/fs/UnixConstants-$(PLATFORM)-$(ARCH).java
@@ -873,12 +869,8 @@ else
$(SFS_GEN)/UnixConstants.java: $(GENUC_EXE)
$(prep-target)
NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(GENUC_COPYRIGHT_YEARS)" > $@
-ifdef CROSS_COMPILE_ARCH
- $(QEMU) $(GENUC_EXE) >> $@
-else
$(GENUC_EXE) >> $@
endif
-endif
GENSC_SRC = $(PLATFORM_SRC)/native/sun/nio/fs/genSolarisConstants.c
@@ -889,7 +881,7 @@ GENSC_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSC_SRC) | \
$(GENSC_EXE) : $(GENSC_SRC)
$(prep-target)
- $(CC) $(CPPFLAGS) -o $@ $(GENSC_SRC)
+ $(CC_FOR_BUILD) $(CPPFLAGS) -o $@ $(GENSC_SRC)
ifdef NIO_PLATFORM_CLASSES_ROOT_DIR
$(SFS_GEN)/SolarisConstants.java: $(NIO_PLATFORM_CLASSES_ROOT_DIR)/sun/nio/fs/SolarisConstants-$(PLATFORM)-$(ARCH).java
@@ -899,11 +891,7 @@ else
$(SFS_GEN)/SolarisConstants.java: $(GENSC_EXE)
$(prep-target)
NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(GENSC_COPYRIGHT_YEARS)" > $@
-ifdef CROSS_COMPILE_ARCH
- $(QEMU) $(GENSC_EXE) >> $@
-else
$(GENSC_EXE) >> $@
endif
-endif
.PHONY: sources
--- openjdk/jdk/make/sun/Makefile.khem 2012-08-10 19:32:40.695550897 -0700
+++ openjdk/jdk/make/sun/Makefile 2012-08-10 19:33:39.195550853 -0700
@@ -55,7 +55,7 @@ ifneq ($(PLATFORM), windows)
endif
endif
HEADLESS_SUBDIR = headless
- XAWT_SUBDIR = xawt
+ XAWT_SUBDIR =
endif
ifndef OPENJDK
@@ -79,7 +79,7 @@ else
endif
SUBDIRS_desktop = audio $(RENDER_SUBDIR) image \
$(DISPLAY_LIBS) $(DGA_SUBDIR) \
- jawt font jpeg cmm $(DISPLAY_TOOLS) beans
+ font jpeg cmm $(DISPLAY_TOOLS) beans
SUBDIRS_management = management
SUBDIRS_misc = $(ORG_SUBDIR) rmi $(JDBC_SUBDIR) tracing
SUBDIRS_tools = native2ascii serialver tools jconsole
|