summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2012-01-14 01:02:44 +0100
committerEike Rathke <erack@redhat.com>2012-01-14 01:02:44 +0100
commit26e2705b90952ec2d736a97b28de205e1cf9da7e (patch)
tree90e24cf8496a590c549625b134876705df285b66 /solenv
parent5ee2cb58eb8cd3a29ca910bd57eda23aa04d1778 (diff)
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.
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/platform/com_GCC_defs.mk11
1 files changed, 0 insertions, 11 deletions
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index 847ef0fc088e..33aa9369a2da 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)))