From: Ian Lance Taylor <iant@golang.org>
Date: Thu, 25 Feb 2010 01:00:25 +0000 (-0800)
Subject: Install runtime.h and cgocall.h.
X-Git-Tag: weekly.2010-03-04~43
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=7c99dcbdf9ace5aa8a0ad76c362ce852045bbab9;p=gostls13.git

Install runtime.h and cgocall.h.

This permits cgo generated code to use these header files even
if the Go sources are not around.

R=rsc
CC=golang-dev
https://golang.org/cl/224045
---

diff --git a/src/Make.pkg b/src/Make.pkg
index 3dd57b7104..5d956c05a4 100644
--- a/src/Make.pkg
+++ b/src/Make.pkg
@@ -30,7 +30,7 @@ QUOTED_GOROOT=$(subst $(space),\ ,$(GOROOT))
 
 pkgdir=$(QUOTED_GOROOT)/pkg/$(GOOS)_$(GOARCH)
 
-INSTALLFILES=$(pkgdir)/$(TARG).a
+INSTALLFILES+=$(pkgdir)/$(TARG).a
 
 # The rest of the cgo rules are below, but these variable updates
 # must be done here so they apply to the main rules.
@@ -150,7 +150,7 @@ _cgo_.so: $(GCC_OFILES)
 	gcc $(_CGO_CFLAGS_$(GOARCH)) -o $@ $(GCC_OFILES) $(CGO_LDFLAGS)  $(_CGO_LDFLAGS_$(GOOS))
 
 $(pkgdir)/$(TARG).so: _cgo_.so
-	@test -d $(QUOTED_GOROOT/pkg && mkdir -p $(pkgdir)/$(dir)
+	@test -d $(QUOTED_GOROOT)/pkg && mkdir -p $(pkgdir)/$(dir)
 	cp _cgo_.so "$@"
 
 # Generic build rules.
diff --git a/src/pkg/runtime/Makefile b/src/pkg/runtime/Makefile
index b6e4eed708..7674720635 100644
--- a/src/pkg/runtime/Makefile
+++ b/src/pkg/runtime/Makefile
@@ -92,11 +92,18 @@ HFILES=\
 
 GOFILES+=$(GOFILES_$(GOOS))
 
+# For use by cgo.
+INSTALLFILES=$(pkgdir)/runtime.h $(pkgdir)/cgocall.h
+
 # special, out of the way compiler flag that means "add runtime metadata to output"
 GC+= -+
 
 include ../../Make.pkg
 
+$(pkgdir)/%.h: %.h
+	@test -d $(QUOTED_GOROOT)/pkg && mkdir -p $(pkgdir)
+	cp $< $@
+
 clean: clean-local
 
 clean-local: