On 13 Jul, Pedro Giffuni wrote: > I did notice the buildbot was failing on nss(?). > That's what I get for taking hunks from elsewhere :-P.
Patch below ... > As you might have noticed I don't spend much quality time > with AOO lately :-(. I've been spending too much B-( Index: main/nss/makefile.mk =================================================================== --- main/nss/makefile.mk (revision 1690824) +++ main/nss/makefile.mk (working copy) @@ -50,6 +50,10 @@ PATCH_FILES+=nss_macosx.patch .ENDIF # "$(OS)"=="MACOSX" +.IF "$(OS)"=="FREEBSD" +PATCH_FILES+=nss_freebsd.patch +.ENDIF + .IF "$(debug)" != "" .ELSE BUILD_OPT=1 Index: main/nss/nss_freebsd.patch =================================================================== --- main/nss/nss_freebsd.patch (revision 0) +++ main/nss/nss_freebsd.patch (working copy) @@ -0,0 +1,14 @@ +--- misc/nss-3.14.4/mozilla/security/coreconf/FreeBSD.mk 2012-05-03 09:42:51.000000000 +0000 ++++ misc/build/nss-3.14.4/mozilla/security/coreconf/FreeBSD.mk 2015-07-13 23:42:44.915864000 +0000 +@@ -5,9 +5,8 @@ + + include $(CORE_DEPTH)/coreconf/UNIX.mk + +-DEFAULT_COMPILER = gcc +-CC = gcc +-CCC = g++ ++DEFAULT_COMPILER = $(CC) ++CCC = $(CXX) + RANLIB = ranlib + + CPU_ARCH = $(OS_TEST) --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org For additional commands, e-mail: dev-h...@openoffice.apache.org
