From da3b96fca69885f74a44e4420ca07b15cf463ef2 Mon Sep 17 00:00:00 2001 From: Jay Krell Date: Fri, 25 Oct 2019 08:46:01 -0700 Subject: [PATCH] [cxx] Compile mini-llvm.c as C++ if configure -enable-cxx. (mono/mono#17558) [cxx] Compile mini-llvm.c as C++ if configure -enable-cxx. This is presently catastrophic, because of `MonoJitICallId` varying between C and C++, and therefore the layout of `MonoCallInst`. Related to: https://github.com/mono/mono/pull/17557 https://github.com/mono/mono/pull/17445#issuecomment-546175352 Commit migrated from https://github.com/mono/mono/commit/893486638cae8efc46323d6c2209fc99febcd05d --- src/mono/mono/mini/Makefile.am.in | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mono/mono/mini/Makefile.am.in b/src/mono/mono/mini/Makefile.am.in index 5f53066..0c66de7 100755 --- a/src/mono/mono/mini/Makefile.am.in +++ b/src/mono/mono/mini/Makefile.am.in @@ -214,6 +214,7 @@ if LOADED_LLVM lib_LTLIBRARIES += libmono-llvm.la libmono_llvm_la_SOURCES = mini-llvm.c mini-llvm-cpp.cpp llvm-jit.cpp libmono_llvm_la_LIBADD = $(glib_libs) $(LLVM_LIBS) $(LLVM_LDFLAGS) +libmono_llvm_la_CFLAGS = $(AM_CFLAGS) @CXX_ADD_CFLAGS@ if HOST_DARWIN libmono_llvm_la_LDFLAGS=-Wl,-undefined -Wl,suppress -Wl,-flat_namespace -- 2.7.4