# HG changeset patch # User Jon Tibble # Date 1326724448 0 # Node ID 5bc09d0bf94d344fe91238ed356c9c8f3f0df2fa # Parent b712ae550d8e498f26d6dd95f5ed1893a293eed1 Fix mozilla-nspr compiler and bump version diff -r b712ae550d8e -r 5bc09d0bf94d components/sic_team/mozilla-nspr/Makefile --- a/components/sic_team/mozilla-nspr/Makefile Wed Dec 21 11:38:40 2011 +0000 +++ b/components/sic_team/mozilla-nspr/Makefile Mon Jan 16 14:34:08 2012 +0000 @@ -27,6 +27,8 @@ CONFIGURE_SCRIPT = $(SOURCE_DIR)/mozilla/nsprpub/configure +CONFIGURE_ENV += CC="$(CC)" + CONFIGURE_LIBDIR.32 = /usr/lib/mps CONFIGURE_LIBDIR.64 = /usr/lib/mps/$(MACH64) diff -r b712ae550d8e -r 5bc09d0bf94d make-rules/shared-macros.mk --- a/make-rules/shared-macros.mk Wed Dec 21 11:38:40 2011 +0000 +++ b/make-rules/shared-macros.mk Mon Jan 16 14:34:08 2012 +0000 @@ -45,7 +45,7 @@ OS_VERSION = $(shell uname -r) SOLARIS_VERSION = $(OS_VERSION:5.%=2.%) -BUILD_NUM = 0.$(shell expr $(LAST_BUILD_NUM) + 1) +BUILD_NUM = 0.$(shell expr $(LAST_BUILD_NUM) + 1).1 BUILD_VERSION = $(OS_VERSION)-$(BUILD_NUM)