equal
deleted
inserted
replaced
43 |
43 |
44 # read machine-specific adjustments (%%% should do this via buildtree.make?) |
44 # read machine-specific adjustments (%%% should do this via buildtree.make?) |
45 ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true) |
45 ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true) |
46 include $(MAKEFILES_DIR)/zeroshark.make |
46 include $(MAKEFILES_DIR)/zeroshark.make |
47 else |
47 else |
48 include $(MAKEFILES_DIR)/$(BUILDARCH).make |
48 BUILDARCH_MAKE = $(MAKEFILES_DIR)/$(BUILDARCH).make |
49 -include $(HS_ALT_MAKE)/$(Platform_os_family)/makefiles/$(BUILDARCH).make |
49 ALT_BUILDARCH_MAKE = $(HS_ALT_MAKE)/$(Platform_os_family)/makefiles/$(BUILDARCH).make |
|
50 include $(if $(wildcard $(ALT_BUILDARCH_MAKE)),$(ALT_BUILDARCH_MAKE),$(BUILDARCH_MAKE)) |
50 endif |
51 endif |
51 |
52 |
52 # set VPATH so make knows where to look for source files |
53 # set VPATH so make knows where to look for source files |
53 # Src_Dirs_V is everything in src/share/vm/*, plus the right os/*/vm and cpu/*/vm |
54 # Src_Dirs_V is everything in src/share/vm/*, plus the right os/*/vm and cpu/*/vm |
54 # The adfiles directory contains ad_<arch>.[ch]pp. |
55 # The adfiles directory contains ad_<arch>.[ch]pp. |