solenv/gbuild/platform/com_GCC_defs.mk | 11 +++++++++++ 1 file changed, 11 insertions(+)
New commits: commit 5ee2cb58eb8cd3a29ca910bd57eda23aa04d1778 Author: Eike Rathke <er...@redhat.com> Date: Fri Jan 13 23:47:35 2012 +0100 make MacOSX happy again and have no /usr/include there Modifies the workaround of 6ecf6ea77f36a444f985fed25a0d0502f5ae8ac4 diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 7dddcbb..847ef0f 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -129,7 +129,18 @@ gb_COMPILEROPTFLAGS := $(gb_COMPILERDEFAULTOPTFLAGS) endif gb_COMPILERNOOPTFLAGS := -O0 + +# At least with gcc 4.6.2 the situation was that if /usr/include was missing +# from the -I... includes, header files were pulled from /usr/include/ instead +# of solver/$INPATH/inc/external/ +# One should not add /usr/include, but ... have this as workaround now. +# However, MacOSX would bail out with lots of deprecated methods as +# /usr/include is not what's used on Mac. +ifeq ($(OS_FOR_BUILD),MACOSX) +gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) +else gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) -I$(SYSBASE)/usr/include +endif gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC))) _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits