Mercurial > hg > truffle
comparison make/solaris/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) 2000, 2012, Oracle and/or its affiliates. All rights reserved. | 2 # Copyright (c) 2000, 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. |
173 | 173 |
174 # Convenience macro which takes a source relative path, applies $(1) to the | 174 # Convenience macro which takes a source relative path, applies $(1) to the |
175 # absolute path, and then replaces $(GAMMADIR) in the result with a | 175 # absolute path, and then replaces $(GAMMADIR) in the result with a |
176 # literal "$(GAMMADIR)/" suitable for inclusion in a Makefile. | 176 # literal "$(GAMMADIR)/" suitable for inclusion in a Makefile. |
177 gamma-path=$(subst $(GAMMADIR),\$$(GAMMADIR),$(call $(1),$(HS_COMMON_SRC)/$(2))) | 177 gamma-path=$(subst $(GAMMADIR),\$$(GAMMADIR),$(call $(1),$(HS_COMMON_SRC)/$(2))) |
178 | |
179 # This bit is needed to enable local rebuilds. | |
180 # Unless the makefile itself sets LP64, any environmental | |
181 # setting of LP64 will interfere with the build. | |
182 LP64_SETTING/32 = LP64 = \#empty | |
183 LP64_SETTING/64 = LP64 = 1 | |
184 | |
185 DATA_MODE/i486 = 32 | |
186 DATA_MODE/sparc = 32 | |
187 DATA_MODE/sparcv9 = 64 | |
188 DATA_MODE/amd64 = 64 | |
189 | |
190 DATA_MODE = $(DATA_MODE/$(BUILDARCH)) | |
178 | 191 |
179 flags.make: $(BUILDTREE_MAKE) ../shared_dirs.lst | 192 flags.make: $(BUILDTREE_MAKE) ../shared_dirs.lst |
180 @echo Creating $@ ... | 193 @echo Creating $@ ... |
181 $(QUIETLY) ( \ | 194 $(QUIETLY) ( \ |
182 $(BUILDTREE_COMMENT); \ | 195 $(BUILDTREE_COMMENT); \ |