comparison make/linux/makefiles/buildtree.make @ 22851:ddce0b7cee93

8072383: resolve conflicts between open and closed ports Summary: refactor close to remove references to closed ports Reviewed-by: kvn, simonis, sgehwolf, dholmes
author dlong
date Tue, 24 Feb 2015 15:04:52 -0500
parents faf0c78e906b
children dd9cc155639c
comparison
equal deleted inserted replaced
22850:34f0c0e9df21 22851:ddce0b7cee93
1 # 1 #
2 # Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. 2 # Copyright (c) 2005, 2015, 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.
68 else 68 else
69 ifdef USE_SUNCC 69 ifdef USE_SUNCC
70 PLATFORM_FILE = $(GAMMADIR)/make/$(OS_FAMILY)/platform_$(BUILDARCH).suncc 70 PLATFORM_FILE = $(GAMMADIR)/make/$(OS_FAMILY)/platform_$(BUILDARCH).suncc
71 else 71 else
72 PLATFORM_FILE = $(GAMMADIR)/make/$(OS_FAMILY)/platform_$(BUILDARCH) 72 PLATFORM_FILE = $(GAMMADIR)/make/$(OS_FAMILY)/platform_$(BUILDARCH)
73 ALT_PLATFORM_FILE = $(HS_ALT_MAKE)/$(OS_FAMILY)/platform_$(BUILDARCH)
74 PLATFORM_FILE := $(if $(wildcard $(ALT_PLATFORM_FILE)),$(ALT_PLATFORM_FILE),$(PLATFORM_FILE))
73 endif 75 endif
74 endif 76 endif
75 77
76 # Allow overriding of the arch part of the directory but default 78 # Allow overriding of the arch part of the directory but default
77 # to BUILDARCH if nothing is specified 79 # to BUILDARCH if nothing is specified
200 flags.make: $(BUILDTREE_MAKE) ../shared_dirs.lst 202 flags.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
201 @echo Creating $@ ... 203 @echo Creating $@ ...
202 $(QUIETLY) ( \ 204 $(QUIETLY) ( \
203 $(BUILDTREE_COMMENT); \ 205 $(BUILDTREE_COMMENT); \
204 echo; \ 206 echo; \
205 echo "Platform_file = $(PLATFORM_FILE)" | sed 's|$(GAMMADIR)|$$(GAMMADIR)|'; \ 207 echo "Platform_file = $(PLATFORM_FILE)" | sed -e 's|$(HS_ALT_MAKE)|$$(HS_ALT_MAKE)|' -e 's|$(GAMMADIR)|$$(GAMMADIR)|'; \
206 sed -n '/=/s/^ */Platform_/p' < $(PLATFORM_FILE); \ 208 sed -n '/=/s/^ */Platform_/p' < $(PLATFORM_FILE); \
207 echo; \ 209 echo; \
208 echo "GAMMADIR = $(GAMMADIR)"; \ 210 echo "GAMMADIR = $(GAMMADIR)"; \
209 echo "HS_ALT_MAKE = $(HS_ALT_MAKE)"; \ 211 echo "HS_ALT_MAKE = $(HS_ALT_MAKE)"; \
210 echo "OSNAME = $(OSNAME)"; \ 212 echo "OSNAME = $(OSNAME)"; \