Skip to content

C
core
Kaydet (Commit) ebb95b5a authored tarafından Eike Rathke's avatar Eike Rathke
Dosyalara gözat
Seçenekler

make MacOSX happy again and have no /usr/include there 

Modifies the workaround of 6ecf6ea7
üst 022ce7d3
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 0 deletions
solenv/gbuild/platform/com_GCC_defs.mk
Dosyayı görüntüle @ ebb95b5a
...@@ -129,7 +129,18 @@ gb_COMPILEROPTFLAGS := $(gb_COMPILERDEFAULTOPTFLAGS) ...@@ -129,7 +129,18 @@ gb_COMPILEROPTFLAGS := $(gb_COMPILERDEFAULTOPTFLAGS)
endif endif
gb_COMPILERNOOPTFLAGS := -O0 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 gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) -I$(SYSBASE)/usr/include
endif
gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC))) gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment