summaryrefslogtreecommitdiff
path: root/src/lib/regexp
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/regexp')
-rw-r--r--src/lib/regexp/Makefile20
-rw-r--r--src/lib/regexp/regexp.go2
2 files changed, 13 insertions, 9 deletions
diff --git a/src/lib/regexp/Makefile b/src/lib/regexp/Makefile
index 86cf44a28..4acc7ddb6 100644
--- a/src/lib/regexp/Makefile
+++ b/src/lib/regexp/Makefile
@@ -5,13 +5,15 @@
# DO NOT EDIT. Automatically generated by gobuild.
# gobuild -m >Makefile
+D=
+
O_arm=5
O_amd64=6
O_386=8
OS=568vq
O=$(O_$(GOARCH))
-GC=$(O)g
+GC=$(O)g -I_obj
CC=$(O)c -FVw
AS=$(O)a
AR=6ar
@@ -19,7 +21,7 @@ AR=6ar
default: packages
clean:
- rm -f *.[$(OS)] *.a [$(OS)].out
+ rm -rf *.[$(OS)] *.a [$(OS)].out _obj
test: packages
gotest
@@ -42,23 +44,25 @@ O1=\
phases: a1
-regexp.a: phases
+_obj$D/regexp.a: phases
a1: $(O1)
- $(AR) grc regexp.a regexp.$O
+ $(AR) grc _obj$D/regexp.a regexp.$O
rm -f $(O1)
newpkg: clean
- $(AR) grc regexp.a
+ mkdir -p _obj$D
+ $(AR) grc _obj$D/regexp.a
$(O1): newpkg
$(O2): a1
nuke: clean
- rm -f $(GOROOT)/pkg/regexp.a
+ rm -f $(GOROOT)/pkg$D/regexp.a
-packages: regexp.a
+packages: _obj$D/regexp.a
install: packages
- cp regexp.a $(GOROOT)/pkg/regexp.a
+ test -d $(GOROOT)/pkg && mkdir -p $(GOROOT)/pkg$D
+ cp _obj$D/regexp.a $(GOROOT)/pkg$D/regexp.a
diff --git a/src/lib/regexp/regexp.go b/src/lib/regexp/regexp.go
index ec55444f3..3ec3ff83a 100644
--- a/src/lib/regexp/regexp.go
+++ b/src/lib/regexp/regexp.go
@@ -23,9 +23,9 @@
package regexp
import (
+ "container/vector";
"os";
"utf8";
- "vector";
)
var debug = false;