Mercurial > hg > truffle
comparison make/bsd/makefiles/buildtree.make @ 8879:bab5cbf74b5f
8011198: LP64 setting is not preserved on Solaris after 8006965
Summary: Fixed incremental build makefiles generated by buildtree.make. Consolidated unix build.sh.
Reviewed-by: twisti
author | kvn |
---|---|
date | Thu, 04 Apr 2013 12:18:46 -0700 |
parents | 98f3af397705 |
children | b9a918201d47 f36e073d56a4 |
comparison
equal
deleted
inserted
replaced
8878:573cf206e381 | 8879:bab5cbf74b5f |
---|---|
1 # | 1 # |
2 # Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. | 2 # Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 # | 4 # |
5 # This code is free software; you can redistribute it and/or modify it | 5 # This code is free software; you can redistribute it and/or modify it |
6 # under the terms of the GNU General Public License version 2 only, as | 6 # under the terms of the GNU General Public License version 2 only, as |
7 # published by the Free Software Foundation. | 7 # published by the Free Software Foundation. |
187 | 187 |
188 # Convenience macro which takes a source relative path, applies $(1) to the | 188 # Convenience macro which takes a source relative path, applies $(1) to the |
189 # absolute path, and then replaces $(GAMMADIR) in the result with a | 189 # absolute path, and then replaces $(GAMMADIR) in the result with a |
190 # literal "$(GAMMADIR)/" suitable for inclusion in a Makefile. | 190 # literal "$(GAMMADIR)/" suitable for inclusion in a Makefile. |
191 gamma-path=$(subst $(GAMMADIR),\$$(GAMMADIR),$(call $(1),$(HS_COMMON_SRC)/$(2))) | 191 gamma-path=$(subst $(GAMMADIR),\$$(GAMMADIR),$(call $(1),$(HS_COMMON_SRC)/$(2))) |
192 | |
193 # This bit is needed to enable local rebuilds. | |
194 # Unless the makefile itself sets LP64, any environmental | |
195 # setting of LP64 will interfere with the build. | |
196 LP64_SETTING/32 = LP64 = \#empty | |
197 LP64_SETTING/64 = LP64 = 1 | |
198 | |
199 DATA_MODE/i486 = 32 | |
200 DATA_MODE/amd64 = 64 | |
201 | |
202 DATA_MODE = $(DATA_MODE/$(BUILDARCH)) | |
192 | 203 |
193 flags.make: $(BUILDTREE_MAKE) ../shared_dirs.lst | 204 flags.make: $(BUILDTREE_MAKE) ../shared_dirs.lst |
194 @echo Creating $@ ... | 205 @echo Creating $@ ... |
195 $(QUIETLY) ( \ | 206 $(QUIETLY) ( \ |
196 $(BUILDTREE_COMMENT); \ | 207 $(BUILDTREE_COMMENT); \ |
210 echo "JRE_RELEASE_VER = $(JRE_RELEASE_VERSION)"; \ | 221 echo "JRE_RELEASE_VER = $(JRE_RELEASE_VERSION)"; \ |
211 echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \ | 222 echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \ |
212 echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \ | 223 echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \ |
213 echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \ | 224 echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \ |
214 echo "OPENJDK = $(OPENJDK)"; \ | 225 echo "OPENJDK = $(OPENJDK)"; \ |
226 echo "$(LP64_SETTING/$(DATA_MODE))"; \ | |
215 echo; \ | 227 echo; \ |
216 echo "# Used for platform dispatching"; \ | 228 echo "# Used for platform dispatching"; \ |
217 echo "TARGET_DEFINES = -DTARGET_OS_FAMILY_\$$(Platform_os_family)"; \ | 229 echo "TARGET_DEFINES = -DTARGET_OS_FAMILY_\$$(Platform_os_family)"; \ |
218 echo "TARGET_DEFINES += -DTARGET_ARCH_\$$(Platform_arch)"; \ | 230 echo "TARGET_DEFINES += -DTARGET_ARCH_\$$(Platform_arch)"; \ |
219 echo "TARGET_DEFINES += -DTARGET_ARCH_MODEL_\$$(Platform_arch_model)"; \ | 231 echo "TARGET_DEFINES += -DTARGET_ARCH_MODEL_\$$(Platform_arch_model)"; \ |