Mercurial > oi > oi-build
changeset 470:728b773771ce oi-extras
Make BUILD_NUM static and update Sun Studio paths
| author | Andrzej Szeszo <aszeszo@gmail.com> |
|---|---|
| date | Thu, 21 Apr 2011 10:38:23 +0100 |
| parents | 71c44d45525a |
| children | 58ea2eba0c94 |
| files | make-rules/shared-macros.mk |
| diffstat | 1 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/make-rules/shared-macros.mk Thu Apr 21 10:34:42 2011 +0100 +++ b/make-rules/shared-macros.mk Thu Apr 21 10:38:23 2011 +0100 @@ -25,7 +25,7 @@ # Default to looking for source archives on the internal mirror before we # hammer on the external repositories. -export DOWNLOAD_SEARCH_PATH += http://userland.us.oracle.com/source-archives/ +#export DOWNLOAD_SEARCH_PATH += http://userland.us.oracle.com/source-archives/ # The workspace starts at the mercurial root export WS_TOP ?= $(shell hg root) @@ -39,8 +39,9 @@ ROOT = / # get the most recent build number from the last mercurial tag -LAST_HG_TAG = $(shell hg tags -q | grep build- | head -1) -LAST_BUILD_NUM = $(LAST_HG_TAG:build-%=%) +#LAST_HG_TAG = $(shell hg tags -q | grep build- | head -1) +#LAST_BUILD_NUM = $(LAST_HG_TAG:build-%=%) +LAST_BUILD_NUM = 147 OS_VERSION = $(shell uname -r) SOLARIS_VERSION = $(OS_VERSION:5.%=2.%) @@ -178,8 +179,8 @@ # BUILD_TOOLS is the root of all tools not normally installed on the system. BUILD_TOOLS = /ws/onnv-tools -SPRO_ROOT = $(BUILD_TOOLS)/SUNWspro -SPRO_VROOT = $(SPRO_ROOT)/sunstudio12.1 +SPRO_ROOT = /opt/SUNWspro +SPRO_VROOT = /opt/sunstudio12.1 GCC_ROOT = /usr/sfw