1.1 --- a/make/linux/makefiles/vm.make Fri Feb 20 17:05:39 2015 +0000
1.2 +++ b/make/linux/makefiles/vm.make Tue Feb 24 15:04:52 2015 -0500
1.3 @@ -1,5 +1,5 @@
1.4 #
1.5 -# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
1.6 +# Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
1.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 #
1.9 # This code is free software; you can redistribute it and/or modify it
1.10 @@ -45,8 +45,9 @@
1.11 ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
1.12 include $(MAKEFILES_DIR)/zeroshark.make
1.13 else
1.14 - include $(MAKEFILES_DIR)/$(BUILDARCH).make
1.15 - -include $(HS_ALT_MAKE)/$(Platform_os_family)/makefiles/$(BUILDARCH).make
1.16 + BUILDARCH_MAKE = $(MAKEFILES_DIR)/$(BUILDARCH).make
1.17 + ALT_BUILDARCH_MAKE = $(HS_ALT_MAKE)/$(Platform_os_family)/makefiles/$(BUILDARCH).make
1.18 + include $(if $(wildcard $(ALT_BUILDARCH_MAKE)),$(ALT_BUILDARCH_MAKE),$(BUILDARCH_MAKE))
1.19 endif
1.20
1.21 # set VPATH so make knows where to look for source files
