summaryrefslogtreecommitdiff
path: root/liborcus
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2013-05-24 14:46:28 +0200
committerFridrich Štrba <fridrich.strba@bluewin.ch>2013-05-24 14:46:28 +0200
commitcdabc886f68c0a8e510c7795dcab9c192cb6b5c8 (patch)
treee6f888434c6a2c09ebc29c650e599ae74fcdb6ff /liborcus
parent3aeecc525c76797801e9e2b24c2ebff6ac81adac (diff)
Revert "Rename Boost libraries when built internally to match conventions"
Diffstat (limited to 'liborcus')
-rw-r--r--liborcus/ExternalProject_liborcus.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk
index 70283f75da83..b6ae1eef8d6b 100644
--- a/liborcus/ExternalProject_liborcus.mk
+++ b/liborcus/ExternalProject_liborcus.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_ExternalProject_use_autoconf,liborcus,build))
$(eval $(call gb_ExternalProject_use_externals,liborcus, \
boost_headers \
- boost_system \
+ boostsystem \
zlib \
))
@@ -38,7 +38,7 @@ endif
ifeq ($(SYSTEM_BOOST),YES)
liborcus_LIBS+=$(BOOST_SYSTEM_LIB)
else
-liborcus_LIBS+=$(SOLARLIB) -lboost_system
+liborcus_LIBS+=$(SOLARLIB) -lboostsystem
endif
ifeq ($(OS),ANDROID)
liborcus_LIBS+=-lgnustl_shared -lm