equal
deleted
inserted
replaced
60 AD_Files_If_Required/TIERED = ad_stuff |
60 AD_Files_If_Required/TIERED = ad_stuff |
61 AD_Files_If_Required = $(AD_Files_If_Required/$(TYPE)) |
61 AD_Files_If_Required = $(AD_Files_If_Required/$(TYPE)) |
62 |
62 |
63 # Wierd argument adjustment for "gnumake -j..." |
63 # Wierd argument adjustment for "gnumake -j..." |
64 adjust-mflags = $(GENERATED)/adjust-mflags |
64 adjust-mflags = $(GENERATED)/adjust-mflags |
65 MFLAGS-adjusted = -r `$(adjust-mflags) "$(MFLAGS)" "$(HOTSPOT_BUILD_JOBS)"` |
65 # If SPEC is set, it's from configure and it's already controlling concurrency |
|
66 # for us. Skip setting -j with HOTSPOT_BUILD_JOBS. |
|
67 ifeq ($(SPEC), ) |
|
68 MFLAGS-adjusted = -r `$(adjust-mflags) "$(MFLAGS)" "$(HOTSPOT_BUILD_JOBS)"` |
|
69 else |
|
70 MFLAGS-adjusted = -r $(MFLAGS) |
|
71 endif |
66 |
72 |
67 |
73 |
68 # default target: update lists, make vm |
74 # default target: update lists, make vm |
69 # done in stages to force sequential order with parallel make |
75 # done in stages to force sequential order with parallel make |
70 # |
76 # |
134 rm -fr $(GENERATED) |
140 rm -fr $(GENERATED) |
135 |
141 |
136 .PHONY: default vm_build_preliminaries |
142 .PHONY: default vm_build_preliminaries |
137 .PHONY: lists ad_stuff jvmti_stuff trace_stuff sa_stuff the_vm clean realclean |
143 .PHONY: lists ad_stuff jvmti_stuff trace_stuff sa_stuff the_vm clean realclean |
138 .PHONY: checks check_os_version install |
144 .PHONY: checks check_os_version install |
|
145 |
|
146 .NOTPARALLEL: |