nss/makefile.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
New commits: commit 39042cce6685fc9db5ee20957bcc7ac584c28554 Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> Date: Wed Jan 4 23:36:45 2012 +0100 compile nss against the Mac OSX SDK nss-3.12.8/mozilla/security/coreconf/Darwin.mk claims gcc would pass syslibroot according to passed -isysroot parameter, hence let's try it for now, although I'm not 100% confident in this statement. libs that get linked without syslibroot include libsqlite3.dylib - and that is a known troublemaker⦠diff --git a/nss/makefile.mk b/nss/makefile.mk index dbb5f07..93cd3d7 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -82,13 +82,8 @@ USE_64:=1 .ENDIF # "$(OS)$(COM)"=="LINUXGCC" .IF "$(OS)"=="MACOSX" -.IF "$(EXTRA_CFLAGS)"!="" -CPP:=gcc -E $(EXTRA_CFLAGS) -CXX:=g++ $(EXTRA_CFLAGS) -CC:=gcc $(EXTRA_CFLAGS) -MACOS_SDK_DIR*=$(MACDEVSDK) -.EXPORT : CPP MACOS_SDK_DIR -.ENDIF # "$(EXTRA_CFLAGS)"!="" +MACOS_SDK_DIR:=$(MACOSX_SDK_PATH) +.EXPORT : MACOS_SDK_DIR .ENDIF # "$(OS)"=="MACOSX" OUT2LIB=mozilla/dist/out/lib/*$(DLLPOST) mozilla/dist/out/lib/libcrmf.a
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits