Mercurial > hg > truffle
comparison make/defs.make @ 228:f232d7d67023
6717128: Using relative path for ALT_OUTPUTDIR does not work properly
Summary: import the absolute output directory when launching sub make process and avoid including defs.make in rules.make
Reviewed-by: kamg, kvn
author | xlu |
---|---|
date | Tue, 24 Jun 2008 16:52:31 -0700 |
parents | 6470a2a42f92 |
children | 9c2ecc2ffb12 |
comparison
equal
deleted
inserted
replaced
227:8d852b81e775 | 228:f232d7d67023 |
---|---|
226 LP64_ARCH = sparcv9 amd64 ia64 | 226 LP64_ARCH = sparcv9 amd64 ia64 |
227 endif | 227 endif |
228 | 228 |
229 # Required make macro settings for all platforms | 229 # Required make macro settings for all platforms |
230 MAKE_ARGS += JAVA_HOME=$(ABS_BOOTDIR) | 230 MAKE_ARGS += JAVA_HOME=$(ABS_BOOTDIR) |
231 MAKE_ARGS += OUTPUTDIR=$(ABS_OUTPUTDIR) | |
231 MAKE_ARGS += GAMMADIR=$(ABS_GAMMADIR) | 232 MAKE_ARGS += GAMMADIR=$(ABS_GAMMADIR) |
232 MAKE_ARGS += MAKE_VERBOSE=$(MAKE_VERBOSE) | 233 MAKE_ARGS += MAKE_VERBOSE=$(MAKE_VERBOSE) |
233 MAKE_ARGS += HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) | 234 MAKE_ARGS += HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) |
234 MAKE_ARGS += JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) | 235 MAKE_ARGS += JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) |
235 | 236 |
259 # Common export list of files | 260 # Common export list of files |
260 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmti.h | 261 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmti.h |
261 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jni.h | 262 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jni.h |
262 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/$(JDK_INCLUDE_SUBDIR)/jni_md.h | 263 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/$(JDK_INCLUDE_SUBDIR)/jni_md.h |
263 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jmm.h | 264 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jmm.h |
264 | |
265 # A list of object files built without the platform specific PIC flags, e.g. | |
266 # -fPIC on linux. Performance measurements show that by compiling GC related | |
267 # code, we could significantly reduce the GC pause time on 32 bit Linux/Unix | |
268 # platforms. See 6454213 for more details. | |
269 include $(GAMMADIR)/make/scm.make | |
270 | |
271 ifneq ($(OSNAME), windows) | |
272 ifndef LP64 | |
273 NONPIC_DIRS = memory oops gc_implementation gc_interface | |
274 NONPIC_DIRS := $(foreach dir,$(NONPIC_DIRS), $(GAMMADIR)/src/share/vm/$(dir)) | |
275 # Look for source files under NONPIC_DIRS | |
276 NONPIC_FILES := $(foreach dir,$(NONPIC_DIRS),\ | |
277 $(shell find $(dir) \( $(SCM_DIRS) \) -prune -o \ | |
278 -name '*.cpp' -print)) | |
279 NONPIC_OBJ_FILES := $(notdir $(subst .cpp,.o,$(NONPIC_FILES))) | |
280 endif | |
281 endif |