core.git: basic/Library_sb.mk basic/source

[Caolán McNamara (via logerrit)]

 basic/Library_sb.mk              |    8 ++++----
 basic/source/runtime/runtime.cxx |    7 +++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

New commits:
commit 7e0afa422cb62443e0fca7668df1fdd938fc76e6
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu Dec 28 23:46:51 2023 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Dec 29 14:54:54 2023 +0100

    ofz#65329 Fuzzing build failure
    
    since:
    
    commit 9cc8457abcae57c7f9de6e0fbca1fbc2a0cc9892
    Date:   Fri Dec 15 23:09:19 2023 -0700
    
        tdf#128122 Updated BASIC CCur to reuse SvNumberFormatter
    
    LibreOfficeOssFuzz.conf has --enable-ld=gold and that will just
    crash on an unresolved symbol without any explanation, but building
    without will give something useful, e.g.
    
    
sbxcurr.cxx:(.text._Z14ImpGetCurrencyPK9SbxValues[_Z14ImpGetCurrencyPK9SbxValues]+0x89f):
 undefined reference to `SbiInstance::GetNumberFormatter()'
    /usr/bin/ld: 
sbxcurr.cxx:(.text._Z14ImpGetCurrencyPK9SbxValues[_Z14ImpGetCurrencyPK9SbxValues]+0xbf7):
 undefined reference to `SbiInstance::PrepareNumberFormatter(unsigned int&, 
unsigned int&, unsigned int&, o3tl::strong_int<unsigned short, LanguageTypeTag> 
const*, DateOrder const*)'
    
    Change-Id: I4b555760a609ec04fd85f7ba9c198a3d2ac712c5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161294
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk
index 8076f0995873..b0e6e454a99b 100644
--- a/basic/Library_sb.mk
+++ b/basic/Library_sb.mk
@@ -93,18 +93,18 @@ $(eval $(call gb_Library_add_exception_objects,sb,\
        basic/source/runtime/props \
        basic/source/runtime/stdobj \
        basic/source/runtime/stdobj1 \
-       basic/source/runtime/runtime \
        basic/source/classes/errobject \
 ))
 endif
 
 $(eval $(call gb_Library_add_exception_objects,sb,\
-       basic/source/runtime/basrdll \
        basic/source/classes/global \
-       basic/source/runtime/methods \
-       basic/source/runtime/methods1 \
        basic/source/classes/sbintern \
        basic/source/comp/basiccharclass \
+       basic/source/runtime/basrdll \
+       basic/source/runtime/methods \
+       basic/source/runtime/methods1 \
+       basic/source/runtime/runtime \
        basic/source/sbx/sbxarray \
        basic/source/sbx/sbxbool \
        basic/source/sbx/sbxbyte \
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 5d3f992cf56a..35627045eda8 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -81,6 +81,8 @@ using namespace com::sun::star::script;
 
 using namespace ::com::sun::star;
 
+#if HAVE_FEATURE_SCRIPTING
+
 static void lcl_clearImpl( SbxVariableRef const & refVar, SbxDataType const & 
eType );
 static void lcl_eraseImpl( SbxVariableRef const & refVar, bool bVBAEnabled );
 
@@ -376,6 +378,8 @@ SbiDllMgr* SbiInstance::GetDllMgr()
     return pDllMgr.get();
 }
 
+#endif
+
 // #39629 create NumberFormatter with the help of a static method now
 std::shared_ptr<SvNumberFormatter> const & SbiInstance::GetNumberFormatter()
 {
@@ -468,6 +472,7 @@ std::shared_ptr<SvNumberFormatter> 
SbiInstance::PrepareNumberFormatter( sal_uInt
     return pNumberFormatter;
 }
 
+#if HAVE_FEATURE_SCRIPTING
 
 // Let engine run. If Flags == BasicDebugFlags::Continue, take Flags over
 
@@ -4762,4 +4767,6 @@ void SbiRuntime::StepSTATIC( sal_uInt32 nOp1, sal_uInt32 
nOp2 )
     StepSTATIC_Impl( aName, t, nOp2 );
 }
 
+#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */