comparison make/solaris/Makefile @ 6778:2c527daec02c

Merge
author jcoomes
date Wed, 19 Sep 2012 16:18:55 -0400
parents 989cf02ca531
children e522a00b91aa 892acf0431ef
comparison
equal deleted inserted replaced
6773:26994b6e10d5 6778:2c527daec02c
235 235
236 # Define INSTALL=y at command line to automatically copy JVM into JAVA_HOME 236 # Define INSTALL=y at command line to automatically copy JVM into JAVA_HOME
237 237
238 $(TARGETS_C2): $(SUBDIRS_C2) 238 $(TARGETS_C2): $(SUBDIRS_C2)
239 cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) 239 cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
240 ifeq ($(TEST_IN_BUILD),true)
240 cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma 241 cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma
242 endif
241 ifdef INSTALL 243 ifdef INSTALL
242 cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install 244 cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install
243 endif 245 endif
244 246
245 $(TARGETS_TIERED): $(SUBDIRS_TIERED) 247 $(TARGETS_TIERED): $(SUBDIRS_TIERED)
246 cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) 248 cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS)
249 ifeq ($(TEST_IN_BUILD),true)
247 cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma 250 cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma
251 endif
248 ifdef INSTALL 252 ifdef INSTALL
249 cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install 253 cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install
250 endif 254 endif
251 255
252 $(TARGETS_C1): $(SUBDIRS_C1) 256 $(TARGETS_C1): $(SUBDIRS_C1)
253 cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) 257 cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS)
258 ifeq ($(TEST_IN_BUILD),true)
254 cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma 259 cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma
260 endif
255 ifdef INSTALL 261 ifdef INSTALL
256 cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install 262 cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install
257 endif 263 endif
258 264
259 $(TARGETS_CORE): $(SUBDIRS_CORE) 265 $(TARGETS_CORE): $(SUBDIRS_CORE)
260 cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) 266 cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS)
267 ifeq ($(TEST_IN_BUILD),true)
261 cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma 268 cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma
269 endif
262 ifdef INSTALL 270 ifdef INSTALL
263 cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install 271 cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
264 endif 272 endif
265 273
266 $(TARGETS_KERNEL): $(SUBDIRS_KERNEL) 274 $(TARGETS_KERNEL): $(SUBDIRS_KERNEL)
267 cd $(OSNAME)_$(BUILDARCH)_kernel/$(patsubst %kernel,%,$@) && $(MAKE) $(MFLAGS) 275 cd $(OSNAME)_$(BUILDARCH)_kernel/$(patsubst %kernel,%,$@) && $(MAKE) $(MFLAGS)
276 ifeq ($(TEST_IN_BUILD),true)
268 cd $(OSNAME)_$(BUILDARCH)_kernel/$(patsubst %kernel,%,$@) && ./test_gamma 277 cd $(OSNAME)_$(BUILDARCH)_kernel/$(patsubst %kernel,%,$@) && ./test_gamma
278 endif
269 ifdef INSTALL 279 ifdef INSTALL
270 cd $(OSNAME)_$(BUILDARCH)_kernel/$(patsubst %kernel,%,$@) && $(MAKE) $(MFLAGS) install 280 cd $(OSNAME)_$(BUILDARCH)_kernel/$(patsubst %kernel,%,$@) && $(MAKE) $(MFLAGS) install
271 endif 281 endif
272 282
273 # Just build the tree, and nothing else: 283 # Just build the tree, and nothing else: