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

Drop CLANGBUILD in addition to CLANGDIR

Browse Source 
...see
<http://lists.freedesktop.org/archives/libreoffice/2014-February/059654.html>
"Drop CLANGBUILD in addition to CLANGDIR?"

Change-Id: I8d68aa0f2298240c8e7265cab273c602f5b6881a
This commit is contained in:
Stephan Bergmann
2014-02-25 10:55:26 +01:00
parent 1efe2782de
commit 95700a2d7d
3 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
compilerplugins/Makefile-clang.mk
View File

@@ -21,7 +21,7 @@ CLANGCXXFLAGS=-O2 -Wall -Wextra -g
# Clang headers require these. # Clang headers require these.
CLANGDEFS=-D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -fno-rtti CLANGDEFS=-D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -fno-rtti
# All include locations needed. # All include locations needed.
CLANGINCLUDES=-isystem $(CLANGDIR)/include -isystem $(CLANGDIR)/tools/clang/include -isystem $(CLANGBUILD)/include -isystem $(CLANGBUILD)/tools/clang/include CLANGINCLUDES=-isystem $(CLANGDIR)/include -isystem $(CLANGDIR)/tools/clang/include
# Clang/LLVM libraries are intentionally not linked in, they are usually built as static libraries, which means the resulting # Clang/LLVM libraries are intentionally not linked in, they are usually built as static libraries, which means the resulting
# plugin would be big (even though the clang binary already includes it all) and it'd be necessary to explicitly specify # plugin would be big (even though the clang binary already includes it all) and it'd be necessary to explicitly specify
@@ -93,7 +93,7 @@ $(CLANGOUTDIR)/plugin.so: $(CLANGOBJS)
-Wl$(CLANG_COMMA)-undefined -Wl$(CLANG_COMMA)suppress) -Wl$(CLANG_COMMA)-undefined -Wl$(CLANG_COMMA)suppress)
# Clang most probably doesn't maintain binary compatibility, so rebuild when clang changes. # Clang most probably doesn't maintain binary compatibility, so rebuild when clang changes.
$(CLANGOUTDIR)/clang-timestamp: $(CLANGBUILD)/bin/clang $(CLANGOUTDIR)/clang-timestamp: $(CLANGDIR)/bin/clang
$(QUIET)touch $@ $(QUIET)touch $@
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

1
config_host.mk.in
View File

@@ -51,7 +51,6 @@ export CC=@CC@
export CDR_CFLAGS=$(gb_SPACE)@CDR_CFLAGS@ export CDR_CFLAGS=$(gb_SPACE)@CDR_CFLAGS@
export CDR_LIBS=$(gb_SPACE)@CDR_LIBS@ export CDR_LIBS=$(gb_SPACE)@CDR_LIBS@
@x_CFLAGS@ export CFLAGS=@CFLAGS@ @x_CFLAGS@ export CFLAGS=@CFLAGS@
export CLANGBUILD=@CLANGBUILD@
export CLANGDIR=@CLANGDIR@ export CLANGDIR=@CLANGDIR@
export CLUCENE_CFLAGS=$(gb_SPACE)@CLUCENE_CFLAGS@ export CLUCENE_CFLAGS=$(gb_SPACE)@CLUCENE_CFLAGS@
export CLUCENE_LIBS=$(gb_SPACE)@CLUCENE_LIBS@ export CLUCENE_LIBS=$(gb_SPACE)@CLUCENE_LIBS@

8
configure.ac
View File

@@ -5656,18 +5656,13 @@ if test "$COM_GCC_IS_CLANG" = "TRUE"; then
if test -z "$CLANGDIR"; then if test -z "$CLANGDIR"; then
CLANGDIR=/usr CLANGDIR=/usr
fi fi
dnl The build directory (different from CLANGDIR if using a Clang out-
dnl of-source build):
if test -z "$CLANGBUILD"; then
CLANGBUILD=/usr
fi
AC_LANG_PUSH([C++]) AC_LANG_PUSH([C++])
save_CPPFLAGS=$CPPFLAGS save_CPPFLAGS=$CPPFLAGS
save_CXX=$CXX save_CXX=$CXX
# compiler plugins must be built with "native" bitness of clang # compiler plugins must be built with "native" bitness of clang
# because they link against clang libraries # because they link against clang libraries
CXX=`echo $CXX | sed -e s/-m64// -e s/-m32//` CXX=`echo $CXX | sed -e s/-m64// -e s/-m32//`
CPPFLAGS="$CPPFLAGS -I$CLANGDIR/include -I$CLANGDIR/tools/clang/include -I$CLANGBUILD/include -I$CLANGBUILD/tools/clang/include -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS" CPPFLAGS="$CPPFLAGS -I$CLANGDIR/include -I$CLANGDIR/tools/clang/include -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS"
AC_CHECK_HEADER(clang/AST/RecursiveASTVisitor.h, AC_CHECK_HEADER(clang/AST/RecursiveASTVisitor.h,
[COMPILER_PLUGINS=TRUE], [COMPILER_PLUGINS=TRUE],
[ [
@@ -5689,7 +5684,6 @@ else
fi fi
AC_SUBST(COMPILER_PLUGINS) AC_SUBST(COMPILER_PLUGINS)
AC_SUBST(CLANGDIR) AC_SUBST(CLANGDIR)
AC_SUBST(CLANGBUILD)
# Plugin to help linker. # Plugin to help linker.
# Add something like LD_PLUGIN=/usr/lib64/LLVMgold.so to your autogen.input. # Add something like LD_PLUGIN=/usr/lib64/LLVMgold.so to your autogen.input.