diff options
| author | Eike Rathke <erack@redhat.com> | 2012-01-13 23:47:35 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2012-01-13 23:47:35 +0100 |
| commit | 5ee2cb58eb8cd3a29ca910bd57eda23aa04d1778 (patch) | |
| tree | 0420ac883e726a4169fed6a8e5e281350064fc9f | |
| parent | f1d713a1a768c77bfa287e7c6a3ac0fa7053c882 (diff) | |
make MacOSX happy again and have no /usr/include there
Modifies the workaround of 6ecf6ea77f36a444f985fed25a0d0502f5ae8ac4
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_defs.mk | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 7dddcbb983c7..847ef0fc088e 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))) |