307 |
307 |
308 $1_CXXFLAGS := $$($1_CFLAGS_INCLUDE) $(CXXFLAGS_JDKLIB) $(CXXFLAGS_DEBUG_SYMBOLS) |
308 $1_CXXFLAGS := $$($1_CFLAGS_INCLUDE) $(CXXFLAGS_JDKLIB) $(CXXFLAGS_DEBUG_SYMBOLS) |
309 |
309 |
310 ifeq ($$($1_TOOLCHAIN), TOOLCHAIN_LINK_CXX) |
310 ifeq ($$($1_TOOLCHAIN), TOOLCHAIN_LINK_CXX) |
311 # For C++, we also need some special treatment. |
311 # For C++, we also need some special treatment. |
312 $1_LDFLAGS := $(LDFLAGS_CXX_JDK) |
312 $1_LDFLAGS := $$(LDFLAGS_CXX_JDK) |
313 $1_LIBS := $(LIBCXX) |
313 $1_LIBS := $(LIBCXX) |
314 |
314 |
315 ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc) |
315 ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc) |
316 $1_CXXFLAGS := $$(filter-out -xregs=no%appl, $$($1_CXXFLAGS)) |
316 $1_CXXFLAGS := $$(filter-out -xregs=no%appl, $$($1_CXXFLAGS)) |
317 endif |
317 endif |
322 SRC := $$($1_SRC), \ |
322 SRC := $$($1_SRC), \ |
323 TOOLCHAIN := $$($1_TOOLCHAIN), \ |
323 TOOLCHAIN := $$($1_TOOLCHAIN), \ |
324 OPTIMIZATION := LOW, \ |
324 OPTIMIZATION := LOW, \ |
325 CFLAGS := $$($1_CFLAGS_INCLUDE) $$(CFLAGS_JDKLIB) $$(CFLAGS_DEBUG_SYMBOLS), \ |
325 CFLAGS := $$($1_CFLAGS_INCLUDE) $$(CFLAGS_JDKLIB) $$(CFLAGS_DEBUG_SYMBOLS), \ |
326 CXXFLAGS := $$($1_CXXFLAGS), \ |
326 CXXFLAGS := $$($1_CXXFLAGS), \ |
327 LDFLAGS := $(filter-out -incremental:no -opt:ref, $(LDFLAGS_JDKLIB)) \ |
327 LDFLAGS := $(filter-out -incremental:no -opt:ref, $$(LDFLAGS_JDKLIB)) \ |
328 $$($1_LDFLAGS), \ |
328 $$($1_LDFLAGS), \ |
329 LDFLAGS_macosx := $(call SET_EXECUTABLE_ORIGIN), \ |
329 LDFLAGS_macosx := $$(call SET_EXECUTABLE_ORIGIN), \ |
330 LIBS := $$($1_LIBS), \ |
330 LIBS := $$($1_LIBS), \ |
331 LIBS_solaris := -lc, \ |
331 LIBS_solaris := -lc, \ |
332 VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ |
332 VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ |
333 RC_FLAGS := $$(RC_FLAGS) \ |
333 RC_FLAGS := $$(RC_FLAGS) \ |
334 -D "JDK_FNAME=$1.dll" \ |
334 -D "JDK_FNAME=$1.dll" \ |