Kaydet (Commit) 4e3e87e8 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Adapt jurt staticsalhack to MACOSX

Change-Id: I0525b68cdb097edd3241809ae0dc9c22e1ad9814
üst 9ec4c4ab
......@@ -72,6 +72,12 @@ $(eval $(call gb_Library_use_externals,jpipe, \
boost_headers \
))
ifeq ($(OS),MACOSX)
$(eval $(call gb_Library_use_system_darwin_frameworks,jpipe, \
CoreFoundation \
))
endif
$(eval $(call gb_Library_add_libs,jpipe, \
$(if $(filter-out $(OS),ANDROID),-lpthread) \
))
......
......@@ -13,6 +13,10 @@
#undef SAL_LOG_INFO
#undef SAL_LOG_WARN
#include <sal/config.h>
#include <cstdlib>
#include <sal/rtl/string.cxx>
#include <sal/rtl/ustring.cxx>
......@@ -57,4 +61,19 @@
#include <sal/textenc/textenc.cxx>
#include <sal/textenc/unichars.cxx>
#if defined MACOSX
#include <sal/osl/unx/osxlocale.cxx>
#include <sal/osl/unx/system.cxx>
#endif
// Called from FullTextEncodingData::get in sal/textenc/textenc.cxx, but only
// defined for ANDROID (in ANDROID-specific sal/textenc/tables.cxx); would even
// work to leave it undefined for LINUX due to no '-z defs' under -fsanitize=*
// (solenv/gbuild/platform/linux.mk), but not for MACOSX:
extern "C" ImplTextEncodingData const * sal_getFullTextEncodingData(
rtl_TextEncoding)
{
std::abort();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment