File 0001-Use-libmono-llvm.la-to-include-LLVM-source... of Package mingw32-mono

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Use-libmono-llvm.la-to-include-LLVM-sources.patch of Package mingw32-mono

From 0ed5c64acc709c24ce47fe3dc8852eb5c005f937 Mon Sep 17 00:00:00 2001
From: Hib Eris <hib@hiberis.nl>
Date: Thu, 10 Feb 2011 13:14:07 +0100
Subject: [PATCH] Use libmono-llvm.la to include LLVM sources

By using the intermediate libllvm.la we stop automake from
linking libmono with a CXX linker/compiler and let it use the C
linker/compiler instead.
---
 mono/mini/Makefile.am |   29 ++++++++++++++++-------------
 1 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/mono/mini/Makefile.am b/mono/mini/Makefile.am
index e95043a..3a2f9d1 100644
--- a/mono/mini/Makefile.am
+++ b/mono/mini/Makefile.am
@@ -118,15 +118,28 @@ moon-do-clean: maintainer-clean-generic
 	-test -z "libmono-moon.la" || rm -f libmono-moon.la
 endif
 
+if ENABLE_LLVM
+noinst_LTLIBRARIES += libllvm.la
+libllvm_la_SOURCES = mini-llvm.c mini-llvm-cpp.cpp
+libllvm_la_LIBADD = $(LLVM_LIBS) $(LLVM_LDFLAGS)
 if LOADED_LLVM
 lib_LTLIBRARIES += libmono-llvm.la
-libmono_llvm_la_SOURCES = mini-llvm.c mini-llvm-cpp.cpp
-libmono_llvm_la_LIBADD = $(LLVM_LIBS) $(LLVM_LDFLAGS)
+libmono_llvm_la_SOURCES =
+libmono_llvm_la_LIBADD = libllvm.la
 if PLATFORM_DARWIN
 libmono_llvm_la_LDFLAGS=-undefined suppress
 else
 libmono_llvm_la_LIBADD += $(top_builddir)/mono/mini/libmono-$(API_VER).la $(libs)
 endif
+else
+libs += libllvm.la
+sgen_libs += libllvm.la
+if MOONLIGHT
+moon_libs += libllvm.la
+endif
+static_libs += libllvm.la
+sgenstatic_libs += libllvm.la
+endif
 endif
 
 endif
@@ -299,16 +312,6 @@ windows_sources = \
 posix_sources = \
 	mini-posix.c
 
-if ENABLE_LLVM
-if LOADED_LLVM
-llvm_sources =
-else
-llvm_sources = \
-	mini-llvm.c		\
-	mini-llvm-cpp.cpp
-endif
-endif
-
 common_sources = \
 	mini.c			\
 	ir-emit.h		\
@@ -501,7 +504,7 @@ os_sources = $(darwin_sources) $(posix_sources)
 monobin_platform_ldflags=-framework CoreFoundation
 endif
 
-libmono_2_0_la_SOURCES = $(common_sources) $(llvm_sources) $(arch_sources) $(os_sources)
+libmono_2_0_la_SOURCES = $(common_sources) $(arch_sources) $(os_sources)
 libmono_2_0_la_CFLAGS = $(mono_CFLAGS)
 libmono_2_0_la_LIBADD = $(libs) $(LIBMONO_DTRACE_OBJECT)
 
-- 
1.7.3.4

Places

File 0001-Use-libmono-llvm.la-to-include-LLVM-sources.patch of Package mingw32-mono

Places