Permalink
Browse files

Merge

Tested-on: morland i686 GNU/Linux
  • Loading branch information...
2 parents 1c670e3 + 8c6b171 commit 181a833ce268ad83f73260b5f2c2495317f8f315 @droundy droundy committed Mar 11, 2010
Showing with 5 additions and 3 deletions.
  1. +4 −2 Makefile
  2. +1 −1 src/gotmake.go
View
@@ -14,8 +14,8 @@ install: installbins installpkgs
include $(GOROOT)/src/Make.$(GOARCH)
-binaries: pkg/gotgo/finalizer.gotgo pkg/gotgo/slice.gotgo bin/gotgo bin/gotmake
-packages: pkg/gotgo/box.gotgo pkg/gotgo/finalizer.gotgo pkg/gotgo/slice.gotgo
+binaries: bin/gotgo bin/gotmake
+packages: pkg/gotgo/box.gotgo pkg/gotgo/box.gotgo.a pkg/gotgo/finalizer.gotgo pkg/gotgo/finalizer.gotgo.a pkg/gotgo/slice.gotgo pkg/gotgo/slice.gotgo.a
ifndef GOBIN
GOBIN=$(HOME)/bin
@@ -43,6 +43,8 @@ $(pkgdir)/gotgo/box.gotgo: pkg/gotgo/box.gotgo
cp $< $@
+# ignoring pkg/gotgo/box.got.go, since it's a generated file
+# ignoring pkg/gotgo/box.gotgo.go, since it's a generated file
# found file pkg/gotgo/finalizer.got to build...
# error: pkg/gotgo/finalizer.got:6:18: expected ';', found '('
pkg/gotgo/finalizer.gotgo: pkg/gotgo/finalizer.got
View
@@ -238,7 +238,7 @@ func (seeker) VisitFile(f string, _ *os.Dir) {
pname, _, _, _ := getImports(f)
basename := f[0:len(f)-3]
if pname == "main" && len(f) > 4 && f[0:4] != "test" &&
- !endswith(f, ".gotgo") {
+ !endswith(basename, ".gotgo") {
mybinfiles += " " + cleanbinname(basename)
} else if startswith(f, "pkg/") {
mypackages += " " + basename + ".a"

0 comments on commit 181a833

Please sign in to comment.