1.1 --- a/make/solaris/makefiles/buildtree.make Thu Apr 04 09:30:06 2013 +0200 1.2 +++ b/make/solaris/makefiles/buildtree.make Thu Apr 04 12:18:46 2013 -0700 1.3 @@ -1,5 +1,5 @@ 1.4 # 1.5 -# Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. 1.6 +# Copyright (c) 2000, 2013, 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 @@ -176,6 +176,19 @@ 1.11 # literal "$(GAMMADIR)/" suitable for inclusion in a Makefile. 1.12 gamma-path=$(subst $(GAMMADIR),\$$(GAMMADIR),$(call $(1),$(HS_COMMON_SRC)/$(2))) 1.13 1.14 +# This bit is needed to enable local rebuilds. 1.15 +# Unless the makefile itself sets LP64, any environmental 1.16 +# setting of LP64 will interfere with the build. 1.17 +LP64_SETTING/32 = LP64 = \#empty 1.18 +LP64_SETTING/64 = LP64 = 1 1.19 + 1.20 +DATA_MODE/i486 = 32 1.21 +DATA_MODE/sparc = 32 1.22 +DATA_MODE/sparcv9 = 64 1.23 +DATA_MODE/amd64 = 64 1.24 + 1.25 +DATA_MODE = $(DATA_MODE/$(BUILDARCH)) 1.26 + 1.27 flags.make: $(BUILDTREE_MAKE) ../shared_dirs.lst 1.28 @echo Creating $@ ... 1.29 $(QUIETLY) ( \