diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk
index 46ceb05..921b763 100644
--- a/external/liborcus/ExternalProject_liborcus.mk
+++ b/external/liborcus/ExternalProject_liborcus.mk
@@ -35,13 +35,16 @@ $(eval $(call gb_ExternalProject_register_targets,liborcus,\
 #$(if $(filter MSC,$(COM)),CPPFLAGS+="-DBOOST_ALL_NO_LIB") CXXFLAGS+="$(BOOST_CXXFLAGS))

 liborcus_LIBS=
+liborcus_BOOST_CFLAGS=
+liborcus_BOOST_LIBS=
 ifneq ($(SYSTEM_ZLIB),)
 liborcus_LIBS+=-lz
 endif
 ifneq ($(SYSTEM_BOOST),)
-liborcus_LIBS+=$(BOOST_SYSTEM_LIB) $(BOOST_IOSTREAMS_LIB) $(BOOST_FILESYSTEM_LIB)
 else
 liborcus_LIBS+=-L$(gb_StaticLibrary_WORKDIR) -lboost_system -lboost_iostreams -lboost_filesystem
+liborcus_BOOST_CFLAGS+=' '
+liborcus_BOOST_LIBS+=' '
 endif
 ifeq ($(OS),ANDROID)
 liborcus_LIBS+=-lgnustl_shared -lm
@@ -88,6 +91,12 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
                $(if $(liborcus_CXXFLAGS),CXXFLAGS='$(liborcus_CXXFLAGS)') \
                $(if $(liborcus_CPPFLAGS),CPPFLAGS='$(liborcus_CPPFLAGS)') \
                $(if $(liborcus_LDFLAGS),LDFLAGS='$(liborcus_LDFLAGS)') \
+               $(if $(liborcus_BOOST_CFLAGS),BOOST_IOSTREAM_CFLAGS=' '\
+                       BOOST_SYSTEM_CFLAGS=' '\
+                       BOOST_FILESYSTEM_CFLAGS=' '\
+                       BOOST_IOSTREAM_LIBS=' '\
+                       BOOST_SYSTEM_LIBS=' '\
+                       BOOST_FILESYSTEM_LIBS=' ')\
                MDDS_CFLAGS='$(MDDS_CFLAGS)' \
                MDDS_LIBS=' ' \
                MAKE=$(MAKE) ./configure