From c6321b8592623b3ea0481ba1afb0e8528cbbf619 Mon Sep 17 00:00:00 2001 From: Lukas Stadler <lukas.stadler@oracle.com> Date: Tue, 15 Mar 2016 10:14:19 +0100 Subject: [PATCH] set LBICONV_PLUG symbol to prevent iconv linkage problems --- com.oracle.truffle.r.native/gnur/Makefile.gnur | 1 + 1 file changed, 1 insertion(+) diff --git a/com.oracle.truffle.r.native/gnur/Makefile.gnur b/com.oracle.truffle.r.native/gnur/Makefile.gnur index c15160be48..76eb523030 100644 --- a/com.oracle.truffle.r.native/gnur/Makefile.gnur +++ b/com.oracle.truffle.r.native/gnur/Makefile.gnur @@ -96,6 +96,7 @@ iconv_build: $(ICONV)/lib/libcharset.so $(ICONV)/lib/libcharset.so: (cd $(ICONV); $(MAKE) MAKE=$(MAKE) && $(MAKE) MAKE=$(MAKE) install > iconv_make.log 2>&1) else + GNUR_CONFIG_FLAGS := CFLAGS=-DLIBICONV_PLUG CPPFLAGS=-DLIBICONV_PLUG CXXFLAGS=-DLIBICONV_PLUG iconv: endif # end SunOS -- GitLab