[Libreoffice-commits] core.git: external/liborcus external/python3

[Matúš Kukan]

 external/liborcus/ExternalProject_liborcus.mk |    2 +-
 external/python3/ExternalProject_python3.mk   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6ae1323442bfa647220d6c46219cff91a849873b
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Sat Feb 22 18:27:30 2014 +0100

    external: Use gb_LTOFLAGS only in LDFLAGS to fix building.
    
    liborcus was not building for me with -flto in CFLAGS, I would have to
    fix ar somehow.
    -flto in LDFLAGS is just to fix the build if the external library does use
    another library built by us with -flto: does happen for liborcus and python3.
    It's not like we would use -flto for external libraries consistently anyway,
    the only exception is icu: no idea why we build with -flto there.
    
    Change-Id: Ia54d619674b8999ce5e4b920ba77b1587c9cf48d

diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk
index 4247e51..d5776f0 100644
--- a/external/liborcus/ExternalProject_liborcus.mk
+++ b/external/liborcus/ExternalProject_liborcus.mk
@@ -68,7 +68,7 @@ liborcus_CPPFLAGS+=-D_GLIBCXX_DEBUG
 endif
 endif
 
-liborcus_CXXFLAGS=$(CXXFLAGS) $(gb_LTOFLAGS)
+liborcus_CXXFLAGS=$(CXXFLAGS)
 liborcus_LDFLAGS=$(LDFLAGS) $(gb_LTOFLAGS)
 ifeq ($(COM),MSC)
 liborcus_CXXFLAGS+=$(BOOST_CXXFLAGS)
diff --git a/external/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk
index 8cce5cb..e07d897 100644
--- a/external/python3/ExternalProject_python3.mk
+++ b/external/python3/ExternalProject_python3.mk
@@ -51,7 +51,7 @@ else
 # create a symlink "LO_lib" because the .so are in a directory with platform
 # specific name like build/lib.linux-x86_64-3.3
 
-python3_cflags = $(ZLIB_CFLAGS) $(gb_LTOFLAGS)
+python3_cflags = $(ZLIB_CFLAGS)
 ifneq (,$(ENABLE_VALGRIND))
     python3_cflags += $(VALGRIND_CFLAGS)
 endif