equal
deleted
inserted
replaced
141 |
141 |
142 ifneq ($(filter $(OPENJDK_TARGET_OS), linux macosx windows), ) |
142 ifneq ($(filter $(OPENJDK_TARGET_OS), linux macosx windows), ) |
143 JVM_PRECOMPILED_HEADER := $(HOTSPOT_TOPDIR)/src/share/vm/precompiled/precompiled.hpp |
143 JVM_PRECOMPILED_HEADER := $(HOTSPOT_TOPDIR)/src/share/vm/precompiled/precompiled.hpp |
144 endif |
144 endif |
145 |
145 |
146 ifneq ($(filter $(OPENJDK_TARGET_OS), macosx aix solaris), ) |
|
147 # On macosx, aix and solaris we have to link with the C++ compiler |
|
148 JVM_TOOLCHAIN := TOOLCHAIN_LINK_CXX |
|
149 else |
|
150 JVM_TOOLCHAIN := TOOLCHAIN_DEFAULT |
|
151 endif |
|
152 |
|
153 ifeq ($(OPENJDK_TARGET_CPU), x86) |
146 ifeq ($(OPENJDK_TARGET_CPU), x86) |
154 JVM_EXCLUDE_PATTERNS += x86_64 |
147 JVM_EXCLUDE_PATTERNS += x86_64 |
155 else ifeq ($(OPENJDK_TARGET_CPU), x86_64) |
148 else ifeq ($(OPENJDK_TARGET_CPU), x86_64) |
156 JVM_EXCLUDE_PATTERNS += x86_32 |
149 JVM_EXCLUDE_PATTERNS += x86_32 |
157 endif |
150 endif |
192 |
185 |
193 ################################################################################ |
186 ################################################################################ |
194 # Now set up the actual compilation of the main hotspot native library |
187 # Now set up the actual compilation of the main hotspot native library |
195 |
188 |
196 $(eval $(call SetupNativeCompilation, BUILD_LIBJVM, \ |
189 $(eval $(call SetupNativeCompilation, BUILD_LIBJVM, \ |
197 TOOLCHAIN := $(JVM_TOOLCHAIN), \ |
190 TOOLCHAIN := TOOLCHAIN_LINK_CXX, \ |
198 LIBRARY := jvm, \ |
191 LIBRARY := jvm, \ |
199 OUTPUT_DIR := $(JVM_OUTPUTDIR), \ |
192 OUTPUT_DIR := $(JVM_OUTPUTDIR), \ |
200 SRC := $(JVM_SRC_DIRS), \ |
193 SRC := $(JVM_SRC_DIRS), \ |
201 EXCLUDES := $(JVM_EXCLUDES), \ |
194 EXCLUDES := $(JVM_EXCLUDES), \ |
202 EXCLUDE_FILES := $(JVM_EXCLUDE_FILES), \ |
195 EXCLUDE_FILES := $(JVM_EXCLUDE_FILES), \ |