[Libreoffice-commits] core.git: 2 commits - configure.ac external/liborcus

[Tor Lillqvist]

 configure.ac                                  |    2 --
 external/liborcus/ExternalProject_liborcus.mk |    2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit ea2ed8a1d442d7f0e00b63abdab15fddb0d58233
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Jun 5 00:46:26 2015 +0300

    Bin superfluous assignments
    
    The variable is assigned an empty value already a few lines above.
    
    Change-Id: I52d2b650d908209421368384e44d95bfe18d93ae

diff --git a/configure.ac b/configure.ac
index ac00539..68242b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5977,10 +5977,8 @@ if test "$COM" = MSC; then
     AC_MSG_CHECKING([whether $CXX supports C++11])
     AC_MSG_RESULT(yes)
     # MSVC supports (a subset of) CXX11 without any switch
-    CXXFLAGS_CXX11=
 elif test "$GCC" = "yes"; then
     HAVE_CXX11=
-    CXXFLAGS_CXX11=
     AC_MSG_CHECKING([whether $CXX supports C++11])
     for flag in -std=gnu++11 -std=gnu++0x -std=c++11 -std=c++0x ; do
         save_CXXFLAGS=$CXXFLAGS
commit e48bb73b818d1e60b6a7a4389151ae6644805d4a
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Jun 5 00:44:12 2015 +0300

    Fix weird compilation problem with __float128
    
    Change-Id: I4a7ac5ee7f2f2c9d9d87517c826c1e80bd23477d

diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk
index ff488bf..8a53fa8 100644
--- a/external/liborcus/ExternalProject_liborcus.mk
+++ b/external/liborcus/ExternalProject_liborcus.mk
@@ -63,7 +63,7 @@ liborcus_CPPFLAGS+=-D_GLIBCXX_DEBUG
 endif
 endif
 
-liborcus_CXXFLAGS=$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX)
+liborcus_CXXFLAGS=$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX) $(CXXFLAGS_CXX11)
 liborcus_LDFLAGS=$(LDFLAGS) $(gb_LTOFLAGS)
 ifeq ($(COM),MSC)
 liborcus_CXXFLAGS+=$(BOOST_CXXFLAGS)