mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

config_clang.h

Browse Source
This commit is contained in:
Lubos Lunak 2012-12-23 22:38:34 +01:00
parent 8c0cb89a4f
commit e1b11cc461
4 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compilerplugins/Makefile-clang.mk
View File

@ -52,7 +52,7 @@ CLANGOBJS=
define clangbuildsrc
$(3): $(2) $(SRCDIR)/compilerplugins/Makefile-clang.mk $(CLANGOUTDIR)/clang-timestamp
@echo [build CXX] $(subst $(SRCDIR)/,,$(2))
$(CXX) $(CLANGCXXFLAGS) $(CLANGDEFS) $(CLANGINCLUDES) -DSRCDIR=$(SRCDIR) $(2) -fPIC -c -o $(3) -MMD -MT $(3) -MP -MF $(CLANGOUTDIR)/$(1).d
$(CXX) $(CLANGCXXFLAGS) $(CLANGDEFS) $(CLANGINCLUDES) -I$(BUILDDIR)/config $(2) -fPIC -c -o $(3) -MMD -MT $(3) -MP -MF $(CLANGOUTDIR)/$(1).d
-include $(CLANGOUTDIR)/$(1).d

8
compilerplugins/clang/sallogareas.cxx
View File

@ -16,6 +16,8 @@
#include <fstream>
#include <config_clang.h>
namespace loplugin
{
@ -110,11 +112,7 @@ void SalLogAreas::checkArea( StringRef area, SourceLocation location )
void SalLogAreas::readLogAreas()
{
#define STRINGIFY2( s ) #s
#define STRINGIFY( s ) STRINGIFY2( s )
ifstream is( STRINGIFY( SRCDIR ) "/sal/inc/sal/log-areas.dox" );
#undef STRINGIFY
#undef STRINGIFY2
ifstream is( SRCDIR "/sal/inc/sal/log-areas.dox" );
while( is.good())
{
string line;

12
config/config_clang.h.in Normal file
View File

@ -0,0 +1,12 @@
/*
Settings related to Clang compiler plugins.
*/
#ifndef CONFIG_CLANG_H
#define CONFIG_CLANG_H
#undef SRCDIR
#endif

3
configure.ac
View File

@ -106,6 +106,7 @@ AC_SUBST(SRC_ROOT)
AC_SUBST(BUILDDIR)
AC_SUBST(EXEEXT_FOR_BUILD)
AC_SUBST(x_Cygwin)
AC_DEFINE_UNQUOTED(SRCDIR,"$SRC_ROOT")
if test "z$EUID" = "z0" -a "`uname -o 2>/dev/null`" = "Cygwin"; then
AC_MSG_ERROR([You must build LibreOffice as a normal user - not using an administrative account])
@ -4164,6 +4165,7 @@ if test "$cross_compiling" = "yes"; then
config_host.mk.in \
configure \
Makefile.in \
config/config_clang.h.in \
config/config_global.h.in \
config/config_graphite.h.in \
config/config_telepathy.h.in \
@ -12353,6 +12355,7 @@ else
fi
AC_CONFIG_FILES([config_host.mk Makefile])
AC_CONFIG_HEADERS([config/config_clang.h])
AC_CONFIG_HEADERS([config/config_global.h])
AC_CONFIG_HEADERS([config/config_graphite.h])
AC_CONFIG_HEADERS([config/config_telepathy.h])