117 LIBJAVA_CFLAGS := $(addprefix -I, $(LIBJAVA_SRC_DIRS)) \ |
117 LIBJAVA_CFLAGS := $(addprefix -I, $(LIBJAVA_SRC_DIRS)) \ |
118 -I$(JDK_TOPDIR)/src/java.base/share/native/libfdlibm \ |
118 -I$(JDK_TOPDIR)/src/java.base/share/native/libfdlibm \ |
119 -I$(SUPPORT_OUTPUTDIR)/headers/java.base \ |
119 -I$(SUPPORT_OUTPUTDIR)/headers/java.base \ |
120 -DARCHPROPNAME='"$(OPENJDK_TARGET_CPU_OSARCH)"' |
120 -DARCHPROPNAME='"$(OPENJDK_TARGET_CPU_OSARCH)"' |
121 |
121 |
122 LIBJAVA_CFLAGS += -DJDK_MAJOR_VERSION='"$(JDK_MAJOR_VERSION)"' \ |
|
123 -DJDK_MINOR_VERSION='"$(JDK_MINOR_VERSION)"' \ |
|
124 -DJDK_MICRO_VERSION='"$(JDK_MICRO_VERSION)"' \ |
|
125 -DJDK_BUILD_NUMBER='"$(JDK_BUILD_NUMBER)"' |
|
126 |
|
127 ifneq (, $(JDK_UPDATE_VERSION)) |
|
128 LIBJAVA_CFLAGS += -DJDK_UPDATE_VERSION='"$(JDK_UPDATE_VERSION)"' |
|
129 endif |
|
130 |
|
131 ifeq ($(OPENJDK_TARGET_OS), macosx) |
122 ifeq ($(OPENJDK_TARGET_OS), macosx) |
132 BUILD_LIBJAVA_java_props_md.c_CFLAGS := -x objective-c |
123 BUILD_LIBJAVA_java_props_md.c_CFLAGS := -x objective-c |
133 BUILD_LIBJAVA_java_props_macosx.c_CFLAGS := -x objective-c |
124 BUILD_LIBJAVA_java_props_macosx.c_CFLAGS := -x objective-c |
134 endif |
125 endif |
135 |
126 |
144 OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ |
135 OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ |
145 SRC := $(LIBJAVA_SRC_DIRS), \ |
136 SRC := $(LIBJAVA_SRC_DIRS), \ |
146 OPTIMIZATION := HIGH, \ |
137 OPTIMIZATION := HIGH, \ |
147 CFLAGS := $(CFLAGS_JDKLIB) \ |
138 CFLAGS := $(CFLAGS_JDKLIB) \ |
148 $(LIBJAVA_CFLAGS), \ |
139 $(LIBJAVA_CFLAGS), \ |
|
140 System.c_CFLAGS := $(VERSION_CFLAGS), \ |
|
141 jdk_util.c_CFLAGS := $(VERSION_CFLAGS), \ |
149 DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \ |
142 DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \ |
150 MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjava/mapfile-vers, \ |
143 MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjava/mapfile-vers, \ |
151 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
144 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
152 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
145 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
153 LDFLAGS_SUFFIX_unix := -ljvm -lverify, \ |
146 LDFLAGS_SUFFIX_unix := -ljvm -lverify, \ |