This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "DotGNU Portable.NET engine, compilers and tools (pnet)".
The branch, master has been updated
via 666e5b4a5bcc8b6c78a961071597eac6584c218e (commit)
from dd5bb410d1657f0a252ce3a0b217384c7c5b0c05 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/pnet.git/commit/?id=666e5b4a5bcc8b6c78a961071597eac6584c218e
commit 666e5b4a5bcc8b6c78a961071597eac6584c218e
Author: Klaus Treichel <[email protected]>
Date: Wed Jun 2 20:58:49 2010 +0200
Partially revert the last commit.
diff --git a/ChangeLog b/ChangeLog
index 355909b..91dcb46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-02 Klaus Treichel <[email protected]>
+
+ * engine/Makefile.am: Readd libgc's include directory to the compiler
+ flags.
+
+ * tests/Makefile.am: likewise.
+
2010-06-01 Klaus Treichel <[email protected]>
* support/pt_defs.h: Don't include libgc's private header gc_priv.h
diff --git a/engine/Makefile.am b/engine/Makefile.am
index 2218068..319a147 100644
--- a/engine/Makefile.am
+++ b/engine/Makefile.am
@@ -7,6 +7,11 @@ if USING_LIBFFI
FFI_INCLUDE += -I../libffi/include
endif
+GC_INCLUDE =
+if USING_LIBGC
+GC_INCLUDE += -I$(top_srcdir)/libgc/include
+endif
+
CVM_INCLUDES = cvm.h cvm_arith.c cvm_branch.c cvm_call.c cvm_compare.c \
cvm_config.h cvm_const.c cvm_conv.c cvm_except.c
cvm_format.h \
cvm_inline.c cvm_interrupt.c cvm_ptr.c cvm_stack.c
cvm_var.c
@@ -190,6 +195,7 @@ ilverify_LDADD = libILEngine.a ../dumpasm/libILDumpAsm.a \
## 'ffi.h' is autogenerated; thus, goes into build tree.
AM_CFLAGS = $(NO_GCSE) $(NO_INLINE_FUNCTIONS) \
$(NO_UNIT_AT_A_TIME) -I$(top_srcdir)/support \
+ $(GC_INCLUDE) \
$(JIT_INCLUDE) \
$(FFI_INCLUDE) -I.
-DBUILD_PROFILE_NAME="\"$(PROFILE_NAME)\""
@@ -209,7 +215,7 @@ ilverify_LDADD = libILEngine.a \
## the interpreter core in direct threading mode.
## GCC 3.4.0 also needs -fno-unit-at-a-time
## 'ffi.h' is autogenerated; thus, goes into build tree.
-AM_CFLAGS = $(FFI_INCLUDE) \
+AM_CFLAGS = $(GC_INCLUDE) $(FFI_INCLUDE) \
$(NO_GCSE) $(NO_INLINE_FUNCTIONS) $(NO_UNIT_AT_A_TIME) \
-I$(top_srcdir)/include -I../support/ -I. \
$(JIT_INCLUDE) \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 84cd77d..796f226 100755
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -11,7 +11,7 @@ test_crypt_SOURCES = test_crypt.c \
test_crypt_LDADD = ../image/libILImage.a ../support/libILSupport.a \
$(GCLIBS)
-AM_CFLAGS = -I$(top_srcdir)/include
+AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/libgc/include
TESTS = test_thread test_crypt
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 7 +++++++
engine/Makefile.am | 8 +++++++-
tests/Makefile.am | 2 +-
3 files changed, 15 insertions(+), 2 deletions(-)
hooks/post-receive
--
DotGNU Portable.NET engine, compilers and tools (pnet)
_______________________________________________
dotgnu-pnet-commits mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/dotgnu-pnet-commits
