[Libreoffice-commits] .: solenv/gbuild

[Eike Rathke]

 solenv/gbuild/platform/com_GCC_defs.mk |   11 -----------
 1 file changed, 11 deletions(-)

New commits:
commit 91d3c11114a75f1f28b3f674e97b8c85948d5d9c
Author: Eike Rathke <erack at redhat.com>
Date:   Sat Jan 14 01:02:27 2012 +0100

    grml.. back to the drawing board
    
    Reverted
    80f60ef540528ec5304b9fb9624a7ff1b077f108
    cf1f87948bcf9b8edf8487fa7938a928cfed8f2f
    as also MinGW bails out. Don't add yet more quirks, keep in mind the faulty
    behavior and hope for the best until solved.

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index 847ef0f..33aa936 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -129,18 +129,7 @@ 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)))