equal
deleted
inserted
replaced
67 AD_Files_If_Required/TIERED = ad_stuff |
67 AD_Files_If_Required/TIERED = ad_stuff |
68 AD_Files_If_Required = $(AD_Files_If_Required/$(TYPE)) |
68 AD_Files_If_Required = $(AD_Files_If_Required/$(TYPE)) |
69 |
69 |
70 # Wierd argument adjustment for "gnumake -j..." |
70 # Wierd argument adjustment for "gnumake -j..." |
71 adjust-mflags = $(GENERATED)/adjust-mflags |
71 adjust-mflags = $(GENERATED)/adjust-mflags |
72 MFLAGS-adjusted = -r `$(adjust-mflags) "$(MFLAGS)" "$(HOTSPOT_BUILD_JOBS)"` |
72 # If SPEC is set, it's from configure and it's already controlling concurrency |
|
73 # for us. Skip setting -j with HOTSPOT_BUILD_JOBS. |
|
74 ifeq ($(SPEC), ) |
|
75 MFLAGS-adjusted = -r `$(adjust-mflags) "$(MFLAGS)" "$(HOTSPOT_BUILD_JOBS)"` |
|
76 else |
|
77 MFLAGS-adjusted = -r $(MFLAGS) |
|
78 endif |
73 |
79 |
74 |
80 |
75 # default target: update lists, make vm |
81 # default target: update lists, make vm |
76 # done in stages to force sequential order with parallel make |
82 # done in stages to force sequential order with parallel make |
77 # |
83 # |
123 @+cat $< > $@+ |
129 @+cat $< > $@+ |
124 @+chmod +x $@+ |
130 @+chmod +x $@+ |
125 @+mv $@+ $@ |
131 @+mv $@+ $@ |
126 |
132 |
127 the_vm: vm_build_preliminaries $(adjust-mflags) |
133 the_vm: vm_build_preliminaries $(adjust-mflags) |
128 @$(UpdatePCH) |
134 +@$(UpdatePCH) |
129 @$(MAKE) -f vm.make $(MFLAGS-adjusted) |
135 @$(MAKE) -f vm.make $(MFLAGS-adjusted) |
130 |
136 |
131 install : the_vm |
137 install : the_vm |
132 @$(MAKE) -f vm.make $@ |
138 @$(MAKE) -f vm.make $@ |
133 |
139 |
134 # next rules support "make foo.[ois]" |
140 # next rules support "make foo.[ois]" |
135 |
141 |
136 %.o %.i %.s: |
142 %.o %.i %.s: |
137 $(UpdatePCH) |
143 +$(UpdatePCH) |
138 $(MAKE) -f vm.make $(MFLAGS) $@ |
144 $(MAKE) -f vm.make $(MFLAGS) $@ |
139 #$(MAKE) -f vm.make $@ |
145 #$(MAKE) -f vm.make $@ |
140 |
146 |
141 # this should force everything to be rebuilt |
147 # this should force everything to be rebuilt |
142 clean: |
148 clean: |
149 rm -fr $(GENERATED) |
155 rm -fr $(GENERATED) |
150 |
156 |
151 .PHONY: default vm_build_preliminaries |
157 .PHONY: default vm_build_preliminaries |
152 .PHONY: lists ad_stuff jvmti_stuff sa_stuff the_vm clean realclean |
158 .PHONY: lists ad_stuff jvmti_stuff sa_stuff the_vm clean realclean |
153 .PHONY: checks check_os_version install |
159 .PHONY: checks check_os_version install |
|
160 |
|
161 .NOTPARALLEL: |