summaryrefslogtreecommitdiff
path: root/src/pkg/runtime/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'src/pkg/runtime/Makefile')
-rw-r--r--src/pkg/runtime/Makefile12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/pkg/runtime/Makefile b/src/pkg/runtime/Makefile
index 521c095b9..e4cc08175 100644
--- a/src/pkg/runtime/Makefile
+++ b/src/pkg/runtime/Makefile
@@ -40,11 +40,8 @@ OFILES_386=\
vlop.$O\
vlrt.$O\
-GOARM?=6
-
# arm-specific object files
OFILES_arm=\
- cas$(GOARM).$O\
memset.$O\
softfloat.$O\
vlop.$O\
@@ -94,6 +91,7 @@ HFILES=\
runtime.h\
hashmap.h\
malloc.h\
+ stack.h\
$(GOARCH)/asm.h\
$(GOOS)/os.h\
$(GOOS)/signals.h\
@@ -129,7 +127,7 @@ mkversion: mkversion.c
quietgcc -o $@ -I "$(GOROOT)/include" $< "$(GOROOT)/lib/lib9.a"
version.go: mkversion
- ./mkversion >version.go
+ GOROOT="$(GOROOT_FINAL)" ./mkversion >version.go
version_$(GOARCH).go:
(echo 'package runtime'; echo 'const theGoarch = "$(GOARCH)"') >$@
@@ -141,13 +139,13 @@ version_$(GOOS).go:
./goc2c "`pwd`/$<" > $@.tmp
mv -f $@.tmp $@
-%.$O: $(GOARCH)/%.c
+%.$O: $(GOARCH)/%.c $(HFILES)
$(CC) $(CFLAGS) $<
-%.$O: $(GOOS)/%.c
+%.$O: $(GOOS)/%.c $(HFILES)
$(CC) $(CFLAGS) $<
-%.$O: $(GOOS)/$(GOARCH)/%.c
+%.$O: $(GOOS)/$(GOARCH)/%.c $(HFILES)
$(CC) $(CFLAGS) $<
%.$O: $(GOARCH)/%.s $(GOARCH)/asm.h