Adapt Clang -fsanitize jurt/source/pipe/staticsalhack.cxx
...to 1782810f886acd26db211d8fdd7ae8796d203c57 "Related: tdf#130725: use strtod
also in rtl::math::stringToDouble". The sal code recompiled into staticsalhack
now uses StaticLibrary_dtoa, and that external/dtoa code needs to be recompiled,
too.
Change-Id: I60a88fc2b38766da36b356f89853f322657bde34
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89662
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
diff --git a/external/dtoa/StaticLibrary_dtoa.mk b/external/dtoa/StaticLibrary_dtoa.mk
index edb358c..9726ffb 100644
--- a/external/dtoa/StaticLibrary_dtoa.mk
+++ b/external/dtoa/StaticLibrary_dtoa.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,dtoa))
$(eval $(call gb_StaticLibrary_use_unpacked,dtoa,dtoa))
# A place that duplicates these settings is jurt/source/pipe/staticsalhack.cxx:
$(eval $(call gb_StaticLibrary_add_cflags,dtoa,-DIEEE_8087))
$(eval $(call gb_StaticLibrary_set_warnings_disabled,dtoa))
diff --git a/jurt/Library_jpipe.mk b/jurt/Library_jpipe.mk
index 204da65..334f6b1 100644
--- a/jurt/Library_jpipe.mk
+++ b/jurt/Library_jpipe.mk
@@ -62,6 +62,8 @@ $(eval $(call gb_Library_set_include,jpipe, \
-I$(SRCDIR)/sal/osl/unx \
-I$(SRCDIR)/sal/rtl \
-I$(SRCDIR)/sal/textenc \
-I$(call gb_UnpackedTarball_get_dir,dtoa) \
-I$(call gb_UnpackedTarball_get_dir,dtoa/include) \
))
$(eval $(call gb_Library_use_externals,jpipe, \
@@ -75,6 +77,8 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,jpipe, \
endif
$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,jpipe)): \
$(call gb_UnpackedTarball_get_target,dtoa)
$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,jpipe)): \
gb_CC := $(filter-out -fsanitize%,$(gb_CC))
$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,jpipe)): \
gb_CXX := $(filter-out -fsanitize%,$(gb_CXX))
diff --git a/jurt/source/pipe/staticsalhack.cxx b/jurt/source/pipe/staticsalhack.cxx
index 4c25067..fa9547a 100644
--- a/jurt/source/pipe/staticsalhack.cxx
+++ b/jurt/source/pipe/staticsalhack.cxx
@@ -76,4 +76,10 @@ extern "C" ImplTextEncodingData const * sal_getFullTextEncodingData(
std::abort();
}
#define IEEE_8087 // see external/dtoa/StaticLibrary_dtoa.mk
#pragma clang diagnostic ignored "-Weverything"
extern "C" {
#include <src/dtoa.c> // workdir/UnpackedTarball/dtoa/src/dtoa.c
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
