[Libreoffice-commits] core.git: Branch 'aoo/trunk' - lingucomponent/Library_MacOSXSpell.mk lingucomponent/source

[Jim Jagielski]

 lingucomponent/Library_MacOSXSpell.mk                        |    6 ++++++
 lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx |    2 ++
 2 files changed, 8 insertions(+)

New commits:
commit 6d1023002af66a4f7453ffdf50ff50f79d443b24
Author: Jim Jagielski <jim at apache.org>
Date:   Thu Jul 5 14:04:55 2018 +0000

    This is a start in the right direction... Now try to track down why we
    
    are getting these undefined symbol errors:
    
    Undefined symbols for architecture x86_64:
    "std::string::find(char const*, unsigned long, unsigned long) const", referenced from:
    Hunspell::spellml(char***, char const*) in libhunspell-1.3.a(hunspell.o)
    "std::string::_Rep::_M_destroy(std::allocator<char> const&)", referenced from:
    Hunspell::spellml(char***, char const*) in libhunspell-1.3.a(hunspell.o)
    "std::string::_Rep::_S_empty_rep_storage", referenced from:
    Hunspell::spellml(char***, char const*) in libhunspell-1.3.a(hunspell.o)
    "std::string::append(char const*, unsigned long)", referenced from:
    Hunspell::spellml(char***, char const*) in libhunspell-1.3.a(hunspell.o)
    "std::string::append(std::string const&)", referenced from:
    Hunspell::spellml(char***, char const*) in libhunspell-1.3.a(hunspell.o)
    "std::string::replace(unsigned long, unsigned long, char const*, unsigned long)", referenced from:
    Hunspell::spellml(char***, char const*) in libhunspell-1.3.a(hunspell.o)
    "std::basic_string<char, std::char_traits<char>, std::allocator<char> >::basic_string(char const*, std::allocator<char> const&)", referenced from:
    Hunspell::spellml(char***, char const*) in libhunspell-1.3.a(hunspell.o)
    "std::__throw_length_error(char const*)", referenced from:
    std::vector<affentry, std::allocator<affentry> >::_M_fill_insert(__gnu_cxx::__normal_iterator<affentry*, std::vector<affentry, std::allocator<affentry> > >, unsigned long, affentry const&) in libhunspell-1.3.a(affixmgr.o)
    ld: symbol(s) not found for architecture x86_64
    clang: error: linker command failed with exit code 1 (use -v to see invocation)
    make: *** [/Users/jim/src/asf/AOO420/main/solenv/gbuild/LinkTarget.mk:251: /Users/jim/src/asf/AOO420/main/solver/420/unxmaccx.pro/workdir/LinkTarget/Library/libspell.uno.dylib] Error 1
    dmake:  Error code 2, while making 'all'

diff --git a/lingucomponent/Library_MacOSXSpell.mk b/lingucomponent/Library_MacOSXSpell.mk
index cd3a7dc098ea..7b33e3a7a725 100644
--- a/lingucomponent/Library_MacOSXSpell.mk
+++ b/lingucomponent/Library_MacOSXSpell.mk
@@ -56,6 +56,8 @@ $(eval $(call gb_Library_add_linked_libs,MacOSXSpell,\
 
 $(eval $(call gb_Library_add_libs,MacOSXSpell,\
 	-framework Cocoa \
+	-framework Carbon \
+	-framework CoreFoundation \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,MacOSXSpell,\
@@ -63,5 +65,9 @@ $(eval $(call gb_Library_add_exception_objects,MacOSXSpell,\
 	lingucomponent/source/spellcheck/macosxspell/macspellimp \
 ))
 
+$(eval $(call gb_Library_add_cxxflags,MacOSXSpell,\
+    -x -objective-c++ -stdlib=libc++ \
+))
+
 # vim: set noet sw=4 ts=4:
 
diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
index 9ad776439f7c..db51849fda59 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
@@ -31,7 +31,9 @@
 #ifdef MACOSX
 #include <premac.h>
 #include <Carbon/Carbon.h>
+#include <CoreFoundation/CoreFoundation.h>
 #import <Cocoa/Cocoa.h>
+#import <Foundation/Foundation.h>
 #include <postmac.h>
 #endif
 #include <com/sun/star/lang/XComponent.hpp>