Skip to content

C
core
Kaydet (Commit) 151abb8b authored tarafından Luboš Luňák's avatar Luboš Luňák
Dosyalara gözat
Seçenekler

use -isystem instead of -I for 3rd party headers 

This should avoid gcc warnings in external code we don't care about,
so there'll be no need to fix them for WaE.

Change-Id: I629dc2672c075908294609249183f27ad2984325
üst 594a1ca9
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 43 deletions
RepositoryExternal.mk
Dosyayı görüntüle @ 151abb8b
...@@ -99,7 +99,7 @@ else #!SYSTEM_NPAPI_HEADERS ...@@ -99,7 +99,7 @@ else #!SYSTEM_NPAPI_HEADERS
define gb_LinkTarget__use_npapi_headers define gb_LinkTarget__use_npapi_headers
$(call gb_LinkTarget_use_package,$(1),npapi) $(call gb_LinkTarget_use_package,$(1),npapi)
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
-I$(OUTDIR)/inc/external/npsdk \ $(ISYSTEM)$(OUTDIR)/inc/external/npsdk \
$$(INCLUDE) \ $$(INCLUDE) \
) )
...@@ -134,7 +134,7 @@ else ...@@ -134,7 +134,7 @@ else
define gb_LinkTarget__use_vigra_headers define gb_LinkTarget__use_vigra_headers
$(call gb_LinkTarget_use_unpacked,$(1),vigra) $(call gb_LinkTarget_use_unpacked,$(1),vigra)
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,vigra/include) \ $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,vigra/include) \
$$(INCLUDE) \ $$(INCLUDE) \
) )
...@@ -151,7 +151,7 @@ else ...@@ -151,7 +151,7 @@ else
define gb_LinkTarget__use_mdds_headers define gb_LinkTarget__use_mdds_headers
$(call gb_LinkTarget_use_unpacked,$(1),mdds) $(call gb_LinkTarget_use_unpacked,$(1),mdds)
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,mdds/include) \ $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,mdds/include) \
$$(INCLUDE) \ $$(INCLUDE) \
) )
...@@ -203,7 +203,7 @@ $(call gb_LinkTarget_use_libraries,$(1),\ ...@@ -203,7 +203,7 @@ $(call gb_LinkTarget_use_libraries,$(1),\
cppunit \ cppunit \
) )
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,cppunit/include)\ $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,cppunit/include)\
$$(INCLUDE) \ $$(INCLUDE) \
) )
...@@ -274,8 +274,8 @@ $(call gb_LinkTarget_add_defs,$(1),\ ...@@ -274,8 +274,8 @@ $(call gb_LinkTarget_add_defs,$(1),\
) )
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,mysqlcppconn) \ $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,mysqlcppconn) \
-I$(call gb_UnpackedTarball_get_dir,mysqlcppconn)/cppconn \ $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,mysqlcppconn)/cppconn \
$$(INCLUDE) \ $$(INCLUDE) \
) )
...@@ -315,7 +315,7 @@ $(call gb_LinkTarget_use_packages,$(1),\ ...@@ -315,7 +315,7 @@ $(call gb_LinkTarget_use_packages,$(1),\
) )
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
-I$(OUTDIR)/inc/external/zlib \ $(ISYSTEM)$(OUTDIR)/inc/external/zlib \
$$(INCLUDE) \ $$(INCLUDE) \
) )
...@@ -363,7 +363,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ ...@@ -363,7 +363,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
define gb_LinkTarget__use_jpeg define gb_LinkTarget__use_jpeg
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \ $$(INCLUDE) \
-I$(OUTDIR)/inc/external/jpeg \ $(ISYSTEM)$(OUTDIR)/inc/external/jpeg \
) )
$(call gb_LinkTarget_use_static_libraries,$(1),\ $(call gb_LinkTarget_use_static_libraries,$(1),\
...@@ -430,7 +430,7 @@ define gb_LinkTarget__use_expat ...@@ -430,7 +430,7 @@ define gb_LinkTarget__use_expat
$(if $(2),,$(error gb_LinkTarget__use_expat needs additional parameter)) $(if $(2),,$(error gb_LinkTarget__use_expat needs additional parameter))
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
-I$(OUTDIR)/inc/external/expat \ $(ISYSTEM)$(OUTDIR)/inc/external/expat \
$$(INCLUDE) \ $$(INCLUDE) \
) )
...@@ -481,7 +481,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ ...@@ -481,7 +481,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
define gb_LinkTarget__use_hyphen define gb_LinkTarget__use_hyphen
$(call gb_LinkTarget_use_unpacked,$(1),hyphen) $(call gb_LinkTarget_use_unpacked,$(1),hyphen)
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,hyphen)\ $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,hyphen)\
$$(INCLUDE) \ $$(INCLUDE) \
) )
$(call gb_LinkTarget_use_static_libraries,$(1),\ $(call gb_LinkTarget_use_static_libraries,$(1),\
...@@ -515,7 +515,7 @@ $(call gb_LinkTarget_add_defs,$(1),\ ...@@ -515,7 +515,7 @@ $(call gb_LinkTarget_add_defs,$(1),\
) )
$(call gb_LinkTarget_use_unpacked,$(1),hunspell) $(call gb_LinkTarget_use_unpacked,$(1),hunspell)
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,hunspell/src/hunspell)\ $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,hunspell/src/hunspell)\
$$(INCLUDE) \ $$(INCLUDE) \
) )
$(call gb_LinkTarget_use_static_libraries,$(1),\ $(call gb_LinkTarget_use_static_libraries,$(1),\
...@@ -592,7 +592,7 @@ endef ...@@ -592,7 +592,7 @@ endef
define gb_LinkTarget__use_boost_headers define gb_LinkTarget__use_boost_headers
$(call gb_LinkTarget_use_unpacked,$(1),boost) $(call gb_LinkTarget_use_unpacked,$(1),boost)
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,boost) \ $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,boost) \
$$(INCLUDE) \ $$(INCLUDE) \
) )
...@@ -673,7 +673,7 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\ ...@@ -673,7 +673,7 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
) )
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,exttextcat/src) \ $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,exttextcat/src) \
$$(INCLUDE) \ $$(INCLUDE) \
) )
...@@ -710,7 +710,7 @@ $(call gb_LinkTarget_use_libraries,$(1),\ ...@@ -710,7 +710,7 @@ $(call gb_LinkTarget_use_libraries,$(1),\
) )
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \ $$(INCLUDE) \
-I$(call gb_UnpackedTarball_get_dir,xml2)/include \ $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,xml2)/include \
) )
endef endef
...@@ -754,7 +754,7 @@ define gb_LinkTarget__use_libxslt ...@@ -754,7 +754,7 @@ define gb_LinkTarget__use_libxslt
$(call gb_LinkTarget_use_package,$(1),xslt) $(call gb_LinkTarget_use_package,$(1),xslt)
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \ $$(INCLUDE) \
-I$(call gb_UnpackedTarball_get_dir,xslt) \ $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,xslt) \
) )
$(call gb_LinkTarget_use_libraries,$(1),\ $(call gb_LinkTarget_use_libraries,$(1),\
xslt \ xslt \
...@@ -766,7 +766,7 @@ define gb_LinkTarget__use_libexslt ...@@ -766,7 +766,7 @@ define gb_LinkTarget__use_libexslt
$(call gb_LinkTarget_use_package,$(1),xslt) $(call gb_LinkTarget_use_package,$(1),xslt)
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \ $$(INCLUDE) \
-I$(call gb_UnpackedTarball_get_dir,xslt) \ $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,xslt) \
) )
$(call gb_LinkTarget_use_libraries,$(1),\ $(call gb_LinkTarget_use_libraries,$(1),\
...@@ -804,7 +804,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ ...@@ -804,7 +804,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
define gb_LinkTarget__use_liblangtag define gb_LinkTarget__use_liblangtag
$(call gb_LinkTarget_use_unpacked,$(1),langtag) $(call gb_LinkTarget_use_unpacked,$(1),langtag)
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,langtag) \ $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,langtag) \
$$(INCLUDE) \ $$(INCLUDE) \
) )
$(call gb_LinkTarget_use_static_libraries,$(1),\ $(call gb_LinkTarget_use_static_libraries,$(1),\
...@@ -842,7 +842,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\ ...@@ -842,7 +842,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
define gb_LinkTarget__use_neon define gb_LinkTarget__use_neon
$(call gb_LinkTarget_use_unpacked,$(1),neon) $(call gb_LinkTarget_use_unpacked,$(1),neon)
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,neon/src) \ $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,neon/src) \
$$(INCLUDE) \ $$(INCLUDE) \
) )
$(call gb_LinkTarget_use_libraries,$(1),\ $(call gb_LinkTarget_use_libraries,$(1),\
...@@ -878,7 +878,7 @@ else # !SYSTEM_REDLAND ...@@ -878,7 +878,7 @@ else # !SYSTEM_REDLAND
define gb_LinkTarget__use_redland_headers define gb_LinkTarget__use_redland_headers
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,redland)/librdf \ $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,redland)/librdf \
$$(INCLUDE) \ $$(INCLUDE) \
) )
...@@ -886,7 +886,7 @@ endef ...@@ -886,7 +886,7 @@ endef
define gb_LinkTarget__use_raptor_headers define gb_LinkTarget__use_raptor_headers
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,raptor)/src \ $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,raptor)/src \
$$(INCLUDE) \ $$(INCLUDE) \
) )
...@@ -894,7 +894,7 @@ endef ...@@ -894,7 +894,7 @@ endef
define gb_LinkTarget__use_rasqal_headers define gb_LinkTarget__use_rasqal_headers
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,rasqal)/src \ $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,rasqal)/src \
$$(INCLUDE) \ $$(INCLUDE) \
) )
...@@ -968,8 +968,8 @@ define gb_LinkTarget__use_cairo ...@@ -968,8 +968,8 @@ define gb_LinkTarget__use_cairo
$(call gb_LinkTarget_use_package,$(1),cairo) $(call gb_LinkTarget_use_package,$(1),cairo)
$(call gb_LinkTarget_use_package,$(1),pixman) $(call gb_LinkTarget_use_package,$(1),pixman)
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,cairo) \ $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,cairo) \
-I$(call gb_UnpackedTarball_get_dir,cairo)/src \ $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,cairo)/src \
$(FREETYPE_CFLAGS) \ $(FREETYPE_CFLAGS) \
$$(INCLUDE) \ $$(INCLUDE) \
) )
...@@ -1031,7 +1031,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ ...@@ -1031,7 +1031,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
define gb_LinkTarget__use_graphite define gb_LinkTarget__use_graphite
$(call gb_LinkTarget_use_unpacked,$(1),graphite) $(call gb_LinkTarget_use_unpacked,$(1),graphite)
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,graphite/include) \ $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,graphite/include) \
$$(INCLUDE) \ $$(INCLUDE) \
) )
$(call gb_LinkTarget_use_static_libraries,$(1),\ $(call gb_LinkTarget_use_static_libraries,$(1),\
...@@ -1083,7 +1083,7 @@ endif ...@@ -1083,7 +1083,7 @@ endif
define gb_LinkTarget__use_icu_headers define gb_LinkTarget__use_icu_headers
$(call gb_LinkTarget_use_package,$(1),icu) $(call gb_LinkTarget_use_package,$(1),icu)
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
-I$(OUTDIR)/inc/external \ $(ISYSTEM)$(OUTDIR)/inc/external \
$$(INCLUDE) \ $$(INCLUDE) \
) )
...@@ -1203,7 +1203,7 @@ endef ...@@ -1203,7 +1203,7 @@ endef
define gb_LinkTarget__use_openssl_headers define gb_LinkTarget__use_openssl_headers
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,openssl)/include \ $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,openssl)/include \
$$(INCLUDE) \ $$(INCLUDE) \
) )
...@@ -1487,7 +1487,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ ...@@ -1487,7 +1487,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
define gb_LinkTarget__use_lcms2 define gb_LinkTarget__use_lcms2
$(call gb_LinkTarget_use_package,$(1),lcms2) $(call gb_LinkTarget_use_package,$(1),lcms2)
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,lcms2/include) \ $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,lcms2/include) \
$$(INCLUDE) \ $$(INCLUDE) \
) )
$(call gb_LinkTarget_use_static_libraries,$(1),\ $(call gb_LinkTarget_use_static_libraries,$(1),\
...@@ -1505,7 +1505,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ ...@@ -1505,7 +1505,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
define gb_LinkTarget__use_lcms2 define gb_LinkTarget__use_lcms2
$(call gb_LinkTarget_use_package,$(1),lcms2) $(call gb_LinkTarget_use_package,$(1),lcms2)
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,lcms2/include) \ $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,lcms2/include) \
$$(INCLUDE) \ $$(INCLUDE) \
) )
$(call gb_LinkTarget_use_libraries,$(1),\ $(call gb_LinkTarget_use_libraries,$(1),\
...@@ -1540,7 +1540,7 @@ $(call gb_LinkTarget_use_libraries,$(1),\ ...@@ -1540,7 +1540,7 @@ $(call gb_LinkTarget_use_libraries,$(1),\
lpsolve55 \ lpsolve55 \
) )
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,lpsolve) \ $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,lpsolve) \
$$(INCLUDE) \ $$(INCLUDE) \
) )
...@@ -1751,7 +1751,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ ...@@ -1751,7 +1751,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
define gb_LinkTarget__use_curl define gb_LinkTarget__use_curl
$(call gb_LinkTarget_use_package,$(1),curl) $(call gb_LinkTarget_use_package,$(1),curl)
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,curl/include) \ $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,curl/include) \
$$(INCLUDE) \ $$(INCLUDE) \
) )
$(call gb_LinkTarget_use_libraries,$(1),\ $(call gb_LinkTarget_use_libraries,$(1),\
...@@ -1814,9 +1814,9 @@ define gb_LinkTarget__use_poppler ...@@ -1814,9 +1814,9 @@ define gb_LinkTarget__use_poppler
$(call gb_LinkTarget_use_package,$(1),xpdf) $(call gb_LinkTarget_use_package,$(1),xpdf)
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,xpdf) \ $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,xpdf) \
-I$(call gb_UnpackedTarball_get_dir,xpdf)/xpdf \ $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,xpdf)/xpdf \
-I$(call gb_UnpackedTarball_get_dir,xpdf)/goo \ $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,xpdf)/goo \
$$(INCLUDE) \ $$(INCLUDE) \
) )
...@@ -1927,7 +1927,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\ ...@@ -1927,7 +1927,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\
define gb_LinkTarget__use_openldap define gb_LinkTarget__use_openldap
$(call gb_LinkTarget_use_unpacked,$(1),openldap) $(call gb_LinkTarget_use_unpacked,$(1),openldap)
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,openldap/include) \ $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,openldap/include) \
$$(INCLUDE) \ $$(INCLUDE) \
) )
$(call gb_LinkTarget_use_package,$(1),openldap) $(call gb_LinkTarget_use_package,$(1),openldap)
...@@ -1969,7 +1969,7 @@ $(call gb_LinkTarget_use_packages,$(1),\ ...@@ -1969,7 +1969,7 @@ $(call gb_LinkTarget_use_packages,$(1),\
) )
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
-I$(OUTDIR)/inc/postgresql \ $(ISYSTEM)$(OUTDIR)/inc/postgresql \
$$(INCLUDE) \ $$(INCLUDE) \
) )
...@@ -2004,7 +2004,7 @@ $(call gb_LinkTarget_add_defs,$(1),\ ...@@ -2004,7 +2004,7 @@ $(call gb_LinkTarget_add_defs,$(1),\
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \ $$(INCLUDE) \
-I$(OUTDIR)/inc/mozilla \ $(ISYSTEM)$(OUTDIR)/inc/mozilla \
) )
$(call gb_LinkTarget_use_libraries,$(1),\ $(call gb_LinkTarget_use_libraries,$(1),\
...@@ -2220,9 +2220,9 @@ define gb_LinkTarget__use_python_headers ...@@ -2220,9 +2220,9 @@ define gb_LinkTarget__use_python_headers
$(call gb_LinkTarget_use_package,$(1),python3) $(call gb_LinkTarget_use_package,$(1),python3)
$(call gb_LinkTarget_use_external_project,$(1),python3) $(call gb_LinkTarget_use_external_project,$(1),python3)
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,python3) \ $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,python3) \
-I$(call gb_UnpackedTarball_get_dir,python3)/PC \ $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,python3)/PC \
-I$(call gb_UnpackedTarball_get_dir,python3)/Include \ $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,python3)/Include \
$$(INCLUDE) \ $$(INCLUDE) \
) )
...@@ -2276,7 +2276,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\ ...@@ -2276,7 +2276,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\
define gb_LinkTarget__use_orcus define gb_LinkTarget__use_orcus
$(call gb_LinkTarget_use_unpacked,$(1),orcus) $(call gb_LinkTarget_use_unpacked,$(1),orcus)
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,orcus/include) \ $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,orcus/include) \
$$(INCLUDE) \ $$(INCLUDE) \
) )
$(call gb_LinkTarget_use_static_libraries,$(1),orcus) $(call gb_LinkTarget_use_static_libraries,$(1),orcus)
...@@ -2403,8 +2403,8 @@ define gb_LinkTarget__use_nss3 ...@@ -2403,8 +2403,8 @@ define gb_LinkTarget__use_nss3
$(call gb_LinkTarget_use_package,$(1),nss) $(call gb_LinkTarget_use_package,$(1),nss)
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \ $$(INCLUDE) \
-I$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/public/nss \ $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/public/nss \
-I$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \ $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \
) )
$(call gb_LinkTarget_use_libraries,$(1),\ $(call gb_LinkTarget_use_libraries,$(1),\
......
config_host.mk.in
Dosyayı görüntüle @ 151abb8b
...@@ -252,6 +252,7 @@ export INPATH_FOR_BUILD=@INPATH_FOR_BUILD@ ...@@ -252,6 +252,7 @@ export INPATH_FOR_BUILD=@INPATH_FOR_BUILD@
export INSTALLDIR=@INSTALLDIR@ export INSTALLDIR=@INSTALLDIR@
export INSTALLDIRNAME=@INSTALLDIRNAME@ export INSTALLDIRNAME=@INSTALLDIRNAME@
export INTRO_BITMAP=@INTRO_BITMAP@ export INTRO_BITMAP=@INTRO_BITMAP@
export ISYSTEM=@ISYSTEM@
export JAVACISGCJ=@JAVACISGCJ@ export JAVACISGCJ=@JAVACISGCJ@
export JAVACISKAFFE=@JAVACISKAFFE@ export JAVACISKAFFE=@JAVACISKAFFE@
export JAVACOMPILER=@JAVACOMPILER@ export JAVACOMPILER=@JAVACOMPILER@
......
configure.ac
Dosyayı görüntüle @ 151abb8b
...@@ -2830,6 +2830,26 @@ printf ("hello world\n"); ...@@ -2830,6 +2830,26 @@ printf ("hello world\n");
fi fi
AC_SUBST(HAVE_LD_BSYMBOLIC_FUNCTIONS) AC_SUBST(HAVE_LD_BSYMBOLIC_FUNCTIONS)
# Use -isystem (gcc) if possible, to avoid warnigs in 3rd party headers.
ISYSTEM=
if test "$GCC" = "yes"; then
AC_MSG_CHECKING( for -isystem )
save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -Werror -finline-limit=0"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ ISYSTEM=-isystem ],[])
CFLAGS=$save_CFLAGS
if test -n "$ISYSTEM"; then
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
fi
fi
if test -z "$ISYSTEM"; then
# fall back to using -I
ISYSTEM=-I
fi
AC_SUBST(ISYSTEM)
dnl =================================================================== dnl ===================================================================
dnl Check which Visual Studio or MinGW compiler is used dnl Check which Visual Studio or MinGW compiler is used
dnl =================================================================== dnl ===================================================================
...@@ -3901,7 +3921,7 @@ else ...@@ -3901,7 +3921,7 @@ else
WORKDIR=${BUILDDIR}/workdir/${INPATH} WORKDIR=${BUILDDIR}/workdir/${INPATH}
fi fi
OUTDIR="${SOLARVER}/${INPATH}" OUTDIR="${SOLARVER}/${INPATH}"
SOLARINC="-I. -I${SOLARVER}/$INPATH/inc/external -I${SOLARVER}/$INPATH/inc -I$SRC_ROOT/solenv/inc $SOLARINC" SOLARINC="-I. ${ISYSTEM}${SOLARVER}/$INPATH/inc/external -I${SOLARVER}/$INPATH/inc -I$SRC_ROOT/solenv/inc $SOLARINC"
AC_SUBST(COM) AC_SUBST(COM)
AC_SUBST(CPU) AC_SUBST(CPU)
AC_SUBST(CPUNAME) AC_SUBST(CPUNAME)
......
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