connectivity/source/drivers/dbase/makefile.mk | 4 +++- solenv/inc/tg_compv.mk | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-)
New commits: commit d0b7d2a311e6e5efe71462e1a2bda845897d58d5 Author: Pedro Giffuni <p...@apache.org> Date: Fri Aug 7 15:14:25 2015 +0000 FreeBSD: Work around clang-3.4 issues. It is well known that clang-3.4 doesn't build all AOO correctly. Workaround the issue for FreeBSD 10 which ships with clang-3.4. The workaround may still be needed for other clang based platforms. Submitted by: Don Lewis diff --git a/connectivity/source/drivers/dbase/makefile.mk b/connectivity/source/drivers/dbase/makefile.mk index 5d5fbfac..62247f7 100644 --- a/connectivity/source/drivers/dbase/makefile.mk +++ b/connectivity/source/drivers/dbase/makefile.mk @@ -76,7 +76,9 @@ EXCEPTIONSFILES=\ $(SLO)$/DDriver.obj # [kh] ppc linux gcc compiler problem -.IF "$(OS)$(COM)$(CPUNAME)"=="LINUXGCCPOWERPC" +# [Don Lewis] clang 3.4 -O2 on amd64 tries to use R_X86_64_PC32 relocation with +# symbol _ZThn192_N12connectivity4file10OFileTable7acquireEvj +.IF "$(OS)$(COM)$(CPUNAME)"=="LINUXGCCPOWERPC" || ("$(OS)$(COM)$(CPUNAME)"=="FREEBSDCLANGX86_64" && $(CCNUMVER)>=000300040000 && $(CCNUMVER)<000300050000) EXCEPTIONSNOOPTFILES= \ $(SLO)$/DTable.obj .ELSE diff --git a/solenv/inc/tg_compv.mk b/solenv/inc/tg_compv.mk index e1295e6..bd0d73a 100644 --- a/solenv/inc/tg_compv.mk +++ b/solenv/inc/tg_compv.mk @@ -38,7 +38,11 @@ CFLAGSNUMVERSION_CMD=-dumpversion $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV) .ELIF "$(COM)"=="CLANG" CFLAGSVERSION=--version CFLAGSVERSION_CMD=--version | head -n1 | sed -e"s/.*version //" -e"s/ .*//" +.IF "$(OS)"="FREEBSD" +CFLAGSNUMVERSION_CMD=${CFLAGSVERSION_CMD} | $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk +.ELSE CFLAGSNUMVERSION_CMD=${CFLAGSVERSION_CMD} | sed -e"s/\.//" +.ENDIF .ELIF "$(COM)"=="MSC" CFLAGSVERSION= CFLAGSVERSION_CMD= $(PIPEERROR) $(AWK) -f $(SOLARENV)/bin/getcompver.awk _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits