Mercurial > hg > truffle

comparison make/Makefile @ 4137:04b9a2566eec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with hsx23/hotspot.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Sat, 17 Dec 2011 21:40:27 +0100
parents 44da449fc29c 436b4a3231bf
children 33df1aeaebbf
comparison
equal deleted inserted replaced
3737:9dc19b7d89a3 4137:04b9a2566eec
336 336
337 # Shared Library 337 # Shared Library
338 ifneq ($(OSNAME),windows) 338 ifneq ($(OSNAME),windows)
339 ifeq ($(ZERO_BUILD), true) 339 ifeq ($(ZERO_BUILD), true)
340 ifeq ($(SHARK_BUILD), true) 340 ifeq ($(SHARK_BUILD), true)
341 $(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(SHARK_DIR)/%.so 341 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX)
342 $(install-file) 342 $(install-file)
343 $(EXPORT_SERVER_DIR)/%.so: $(SHARK_DIR)/%.so 343 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX)
344 $(install-file) 344 $(install-file)
345 else 345 else
346 $(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(ZERO_DIR)/%.so 346 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX)
347 $(install-file) 347 $(install-file)
348 $(EXPORT_SERVER_DIR)/%.so: $(ZERO_DIR)/%.so 348 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX)
349 $(install-file) 349 $(install-file)
350 endif 350 endif
351 else 351 else
352 $(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(C1_DIR)/%.so 352 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
353 $(install-file) 353 $(install-file)
354 $(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(C2_DIR)/%.so 354 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
355 $(install-file) 355 $(install-file)
356 $(EXPORT_CLIENT_DIR)/%.so: $(C1_DIR)/%.so 356 $(EXPORT_CLIENT_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
357 $(install-file) 357 $(install-file)
358 $(EXPORT_CLIENT_DIR)/64/%.so: $(C1_DIR)/%.so 358 $(EXPORT_CLIENT_DIR)/64/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
359 $(install-file) 359 $(install-file)
360 $(EXPORT_SERVER_DIR)/%.so: $(C2_DIR)/%.so 360 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
361 $(install-file) 361 $(install-file)
362 $(EXPORT_SERVER_DIR)/64/%.so: $(C2_DIR)/%.so 362 $(EXPORT_SERVER_DIR)/64/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
363 $(install-file)
364
365 # Debug info for shared library
366 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo
367 $(install-file)
368 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo
369 $(install-file)
370 $(EXPORT_CLIENT_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo
371 $(install-file)
372 $(EXPORT_CLIENT_DIR)/64/%.debuginfo: $(C1_DIR)/%.debuginfo
373 $(install-file)
374 $(EXPORT_SERVER_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo
375 $(install-file)
376 $(EXPORT_SERVER_DIR)/64/%.debuginfo: $(C2_DIR)/%.debuginfo
363 $(install-file) 377 $(install-file)
364 endif 378 endif
365 endif 379 endif
366 380
367 # Jar file (sa-jdi.jar) 381 # Jar file (sa-jdi.jar)
470 else \ 484 else \
471 ($(CD) $(JDK_IMPORT_PATH) && \ 485 ($(CD) $(JDK_IMPORT_PATH) && \
472 $(TAR) -cf - $(JDK_DIRS)) | \ 486 $(TAR) -cf - $(JDK_DIRS)) | \
473 ($(CD) $(JDK_IMAGE_DIR)/debug && $(TAR) -xf -) ; \ 487 ($(CD) $(JDK_IMAGE_DIR)/debug && $(TAR) -xf -) ; \
474 fi 488 fi
489
490 # macosx universal builds
491
492 ifeq ($(MACOSX_UNIVERSAL), true)
493 $(UNIVERSAL_LIPO_LIST):
494 lipo -create -output $@ $(EXPORT_JRE_LIB_DIR)/{i386,amd64}/$(subst $(EXPORT_JRE_LIB_DIR)/,,$@)
495
496 $(UNIVERSAL_COPY_LIST):
497 $(CP) $(EXPORT_JRE_LIB_DIR)/i386/$(subst $(EXPORT_JRE_LIB_DIR)/,,$@) $@
498
499 universalize: $(UNIVERSAL_LIPO_LIST) $(UNIVERSAL_COPY_LIST)
500 endif
501
502 universal_product:
503 $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=32 MACOSX_UNIVERSAL=true all_product
504 $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=64 MACOSX_UNIVERSAL=true all_product
505 $(MKDIR) -p $(EXPORT_JRE_LIB_DIR)/{client,server}
506 $(QUIETLY) $(MAKE) MACOSX_UNIVERSAL=true universalize
507
508 universal_fastdebug:
509 $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=32 MACOSX_UNIVERSAL=true all_fastdebug
510 $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=64 MACOSX_UNIVERSAL=true all_fastdebug
511 $(MKDIR) -p $(EXPORT_JRE_LIB_DIR)/{client,server}
512 $(QUIETLY) $(MAKE) MACOSX_UNIVERSAL=true universalize
513
514 universal_debug:
515 $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=32 MACOSX_UNIVERSAL=true all_debug
516 $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=64 MACOSX_UNIVERSAL=true all_debug
517 $(MKDIR) -p $(EXPORT_JRE_LIB_DIR)/{client,server}
518 $(QUIETLY) $(MAKE) MACOSX_UNIVERSAL=true universalize
475 519
476 # 520 #
477 # Check target 521 # Check target
478 # 522 #
479 check: variable_check 523 check: variable_check
599 $(KERNEL_VM_TARGETS) \ 643 $(KERNEL_VM_TARGETS) \
600 generic_build1 generic_build2 generic_buildkernel generic_export \ 644 generic_build1 generic_build2 generic_buildkernel generic_export \
601 export_product export_fastdebug export_debug export_optimized \ 645 export_product export_fastdebug export_debug export_optimized \
602 export_jdk_product export_jdk_fastdebug export_jdk_debug \ 646 export_jdk_product export_jdk_fastdebug export_jdk_debug \
603 create_jdk copy_jdk update_jdk test_jdk \ 647 create_jdk copy_jdk update_jdk test_jdk \
604 copy_product_jdk copy_fastdebug_jdk copy_debug_jdk 648 copy_product_jdk copy_fastdebug_jdk copy_debug_jdk universalize \
605 649 universal_product
650