equal
deleted
inserted
replaced
31 export WS_TOP ?= $(shell hg root) |
31 export WS_TOP ?= $(shell hg root) |
32 |
32 |
33 CONSOLIDATION = userland |
33 CONSOLIDATION = userland |
34 PUBLISHER ?= $(CONSOLIDATION) |
34 PUBLISHER ?= $(CONSOLIDATION) |
35 |
35 |
36 IS_GLOBAL_ZONE = $(shell /usr/sbin/zoneadm list | grep -c global) |
|
37 ROOT = / |
36 ROOT = / |
38 |
37 |
39 # get the most recent build number from the last mercurial tag |
38 # get the most recent build number from the last mercurial tag |
40 LAST_HG_TAG = $(shell hg tags -q | grep build- | head -1) |
39 LAST_HG_TAG = $(shell hg tags -q | grep build- | head -1) |
41 LAST_BUILD_NUM = $(LAST_HG_TAG:build-%=%) |
40 LAST_BUILD_NUM = $(LAST_HG_TAG:build-%=%) |
160 CCC.studio.32 = $(SPRO_VROOT)/bin/CC |
159 CCC.studio.32 = $(SPRO_VROOT)/bin/CC |
161 |
160 |
162 CC.studio.64 = $(SPRO_VROOT)/bin/cc |
161 CC.studio.64 = $(SPRO_VROOT)/bin/cc |
163 CCC.studio.64 = $(SPRO_VROOT)/bin/CC |
162 CCC.studio.64 = $(SPRO_VROOT)/bin/CC |
164 |
163 |
165 CC.gcc.32 = $(GCC_ROOT)/bin/gcc -m32 |
164 CC.gcc.32 = $(GCC_ROOT)/bin/gcc |
166 CCC.gcc.32 = $(GCC_ROOT)/bin/g++ -m32 |
165 CCC.gcc.32 = $(GCC_ROOT)/bin/g++ |
167 |
166 |
168 CC.gcc.64 = $(GCC_ROOT)/bin/gcc -m64 |
167 CC.gcc.64 = $(GCC_ROOT)/bin/gcc |
169 CCC.gcc.64 = $(GCC_ROOT)/bin/g++ -m64 |
168 CCC.gcc.64 = $(GCC_ROOT)/bin/g++ |
170 |
169 |
171 CC = $(CC.$(COMPILER).$(BITS)) |
170 CC = $(CC.$(COMPILER).$(BITS)) |
172 CCC = $(CCC.$(COMPILER).$(BITS)) |
171 CCC = $(CCC.$(COMPILER).$(BITS)) |
173 |
172 |
174 lint.32 = $(SPRO_VROOT)/bin/lint -m32 |
173 lint.32 = $(SPRO_VROOT)/bin/lint -m32 |