diff mbox

[gccgo] Merge libgotesting into libgo

Message ID mcrwrqwgkdc.fsf@google.com
State New
Headers show

Commit Message

Ian Lance Taylor Sept. 8, 2010, 6:28 p.m. UTC 
A long time ago I split libgotesting out of libgo, because I was using
constructors to run initializers and it caused some problem I can not
recall.  However, I have since fixed the way that initializers are run,
and we now only initialized packages which were actually imported.  This
patch merges libgotesting back into libgo, which is simpler and more
correct.  Committed to gccgo branch.

Ian
diff mbox

Patch

diff -r 49d113913255 libgo/Makefile.am
--- a/libgo/Makefile.am	Wed Sep 08 11:10:07 2010 -0700
+++ b/libgo/Makefile.am	Wed Sep 08 11:27:44 2010 -0700
@@ -92,7 +92,7 @@ 
 # Subdir rules rely on $(FLAGS_TO_PASS)
 FLAGS_TO_PASS = $(AM_MAKEFLAGS)
 
-toolexeclib_LTLIBRARIES = libgo.la libgotesting.la
+toolexeclib_LTLIBRARIES = libgo.la
 toolexeclib_LIBRARIES = libgobegin.a
 
 toolexeclib_DATA = \
@@ -1177,7 +1177,11 @@ 
 	os/libsignal.la \
 	rpc/libjsonrpc.la \
 	runtime/libpprof.la \
-	syscalls/libsyscall.la
+	syscalls/libsyscall.la \
+	testing/libtesting.la \
+	testing/libiotest.la \
+	testing/libquick.la \
+	testing/libscript.la
 
 libgo_la_SOURCES = $(runtime_files)
 
@@ -1186,13 +1190,6 @@ 
 libgobegin_a_SOURCES = \
 	runtime/go-main.c
 
-libgotesting_la_SOURCES =
-libgotesting_la_LIBADD = \
-	testing/libtesting.la \
-	testing/libiotest.la \
-	testing/libquick.la \
-	testing/libscript.la
-
 LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS))
 
 GOFLAGS = $(CFLAGS)
diff -r 49d113913255 libgo/testsuite/gotest
--- a/libgo/testsuite/gotest	Wed Sep 08 11:10:07 2010 -0700
+++ b/libgo/testsuite/gotest	Wed Sep 08 11:27:44 2010 -0700
@@ -16,7 +16,7 @@ 
 
 GC=${GC:-gccgo}
 GL=${GL:-${GC-gccgo}}
-GOLIBS=${GOLIBS:=-lgotesting}
+GOLIBS=
 export GC GL GOLIBS
 
 # srcdir is where the source files are found.  basedir is where the