summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@collabora.com>2014-02-22 18:27:30 +0100
committerMatúš Kukan <matus.kukan@collabora.com>2014-02-22 18:34:48 +0100
commit6ae1323442bfa647220d6c46219cff91a849873b (patch)
tree7a7bd50c739fe6c8b1ee622412c2ef5d65a36c96 /external
parent53ae62d5761034e808596816fd36475a8e02de73 (diff)
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
Diffstat (limited to 'external')
-rw-r--r--external/liborcus/ExternalProject_liborcus.mk2
-rw-r--r--external/python3/ExternalProject_python3.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk
index 4247e51f7812..d5776f0491e7 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 8cce5cb1eea7..e07d8972860b 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