Mercurial > hg > graal-compiler
comparison make/Makefile @ 13102:f9f4503a4ab5
Merge
author | Christos Kotselidis <christos.kotselidis@oracle.com> |
---|---|
date | Thu, 21 Nov 2013 15:04:54 +0100 |
parents | 096c224171c4 |
children | d8041d695d19 |
comparison
equal
deleted
inserted
replaced
13101:790ebab62d23 | 13102:f9f4503a4ab5 |
---|---|
356 $(install-file) | 356 $(install-file) |
357 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(C2_BUILD_DIR)/%.diz | 357 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(C2_BUILD_DIR)/%.diz |
358 $(install-file) | 358 $(install-file) |
359 $(EXPORT_SERVER_DIR)/64/%.diz: $(C2_BUILD_DIR)/%.diz | 359 $(EXPORT_SERVER_DIR)/64/%.diz: $(C2_BUILD_DIR)/%.diz |
360 $(install-file) | 360 $(install-file) |
361 # MacOS X | |
362 $(EXPORT_JRE_LIB_ARCH_DIR)/%.dSYM: $(C2_BUILD_DIR)/%.dSYM | |
363 $(install-dir) | |
364 $(EXPORT_SERVER_DIR)/%.dSYM: $(C2_BUILD_DIR)/%.dSYM | |
365 $(install-dir) | |
361 | 366 |
362 # Graal | 367 # Graal |
363 # Common | 368 # Common |
364 $(EXPORT_SERVER_DIR)/%.diz: $(GRAAL_BUILD_DIR)/%.diz | 369 $(EXPORT_SERVER_DIR)/%.diz: $(GRAAL_BUILD_DIR)/%.diz |
365 $(install-file) | 370 $(install-file) |
399 $(install-file) | 404 $(install-file) |
400 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(GRAAL_BUILD_DIR)/%.diz | 405 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(GRAAL_BUILD_DIR)/%.diz |
401 $(install-file) | 406 $(install-file) |
402 $(EXPORT_SERVER_DIR)/64/%.diz: $(GRAAL_BUILD_DIR)/%.diz | 407 $(EXPORT_SERVER_DIR)/64/%.diz: $(GRAAL_BUILD_DIR)/%.diz |
403 $(install-file) | 408 $(install-file) |
409 # MacOS X | |
410 $(EXPORT_JRE_LIB_ARCH_DIR)/%.dSYM: $(GRAAL_BUILD_DIR)/%.dSYM | |
411 $(install-dir) | |
412 $(EXPORT_SERVER_DIR)/%.dSYM: $(GRAAL_BUILD_DIR)/%.dSYM | |
413 $(install-dir) | |
414 | |
404 endif | 415 endif |
405 | 416 |
406 # Client (C1) | 417 # Client (C1) |
407 ifeq ($(JVM_VARIANT_CLIENT), true) | 418 ifeq ($(JVM_VARIANT_CLIENT), true) |
408 # Common | 419 # Common |
444 $(install-file) | 455 $(install-file) |
445 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(C1_BUILD_DIR)/%.diz | 456 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(C1_BUILD_DIR)/%.diz |
446 $(install-file) | 457 $(install-file) |
447 $(EXPORT_CLIENT_DIR)/64/%.diz: $(C1_BUILD_DIR)/%.diz | 458 $(EXPORT_CLIENT_DIR)/64/%.diz: $(C1_BUILD_DIR)/%.diz |
448 $(install-file) | 459 $(install-file) |
460 # MacOS X | |
461 $(EXPORT_JRE_LIB_ARCH_DIR)/%.dSYM: $(C1_BUILD_DIR)/%.dSYM | |
462 $(install-dir) | |
463 $(EXPORT_CLIENT_DIR)/%.dSYM: $(C1_BUILD_DIR)/%.dSYM | |
464 $(install-dir) | |
449 endif | 465 endif |
450 | 466 |
451 # Minimal1 | 467 # Minimal1 |
452 ifeq ($(JVM_VARIANT_MINIMAL1), true) | 468 ifeq ($(JVM_VARIANT_MINIMAL1), true) |
453 # Common | 469 # Common |
489 $(install-file) | 505 $(install-file) |
490 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(MINIMAL1_BUILD_DIR)/%.diz | 506 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(MINIMAL1_BUILD_DIR)/%.diz |
491 $(install-file) | 507 $(install-file) |
492 $(EXPORT_MINIMAL_DIR)/64/%.diz: $(MINIMAL1_BUILD_DIR)/%.diz | 508 $(EXPORT_MINIMAL_DIR)/64/%.diz: $(MINIMAL1_BUILD_DIR)/%.diz |
493 $(install-file) | 509 $(install-file) |
510 # MacOS X does not support Minimal1 config | |
494 endif | 511 endif |
495 | 512 |
496 # Zero | 513 # Zero |
497 ifeq ($(JVM_VARIANT_ZERO), true) | 514 ifeq ($(JVM_VARIANT_ZERO), true) |
498 # Common | 515 # Common |
511 $(install-file) | 528 $(install-file) |
512 $(EXPORT_SERVER_DIR)/%.debuginfo: $(ZERO_BUILD_DIR)/%.debuginfo | 529 $(EXPORT_SERVER_DIR)/%.debuginfo: $(ZERO_BUILD_DIR)/%.debuginfo |
513 $(install-file) | 530 $(install-file) |
514 $(EXPORT_SERVER_DIR)/%.diz: $(ZERO_BUILD_DIR)/%.diz | 531 $(EXPORT_SERVER_DIR)/%.diz: $(ZERO_BUILD_DIR)/%.diz |
515 $(install-file) | 532 $(install-file) |
533 # MacOS X | |
534 $(EXPORT_JRE_LIB_ARCH_DIR)/%.dSYM: $(ZERO_BUILD_DIR)/%.dSYM | |
535 $(install-dir) | |
536 $(EXPORT_SERVER_DIR)/%.dSYM: $(ZERO_BUILD_DIR)/%.dSYM | |
537 $(install-dir) | |
516 endif | 538 endif |
517 | 539 |
518 # Shark | 540 # Shark |
519 ifeq ($(JVM_VARIANT_ZEROSHARK), true) | 541 ifeq ($(JVM_VARIANT_ZEROSHARK), true) |
520 # Common | 542 # Common |
533 $(install-file) | 555 $(install-file) |
534 $(EXPORT_SERVER_DIR)/%.debuginfo: $(SHARK_BUILD_DIR)/%.debuginfo | 556 $(EXPORT_SERVER_DIR)/%.debuginfo: $(SHARK_BUILD_DIR)/%.debuginfo |
535 $(install-file) | 557 $(install-file) |
536 $(EXPORT_SERVER_DIR)/%.diz: $(SHARK_BUILD_DIR)/%.diz | 558 $(EXPORT_SERVER_DIR)/%.diz: $(SHARK_BUILD_DIR)/%.diz |
537 $(install-file) | 559 $(install-file) |
560 # MacOS X | |
561 $(EXPORT_JRE_LIB_ARCH_DIR)/%.dSYM: $(SHARK_BUILD_DIR)/%.dSYM | |
562 $(install-dir) | |
563 $(EXPORT_SERVER_DIR)/%.dSYM: $(SHARK_BUILD_DIR)/%.dSYM | |
564 $(install-dir) | |
538 endif | 565 endif |
539 | 566 |
540 $(EXPORT_JRE_LIB_DIR)/%.jar: $(SHARED_DIR)/%.jar | 567 $(EXPORT_JRE_LIB_DIR)/%.jar: $(SHARED_DIR)/%.jar |
541 $(install-file) | 568 $(install-file) |
542 | 569 |