cmd/gc: if $GOROOT_FINAL is set, rewrite file names in object files

GOROOT_FINAL is a build parameter that means "eventually
the Go tree will be installed here".  Make the file name information
match that eventual location.

Fixes #3180.

R=ken, ken
CC=golang-dev
https://golang.org/cl/5742043

diff --git a/src/cmd/dist/build.c b/src/cmd/dist/build.c
index a40853fad00c4dffc6390cf784f5c421528fe3cd..27741e4b0f0d3a13454f59ccc3a55dfdaa0e3d5b 100644 (file)
--- a/src/cmd/dist/build.c
+++ b/src/cmd/dist/build.c
@@ -1351,6 +1351,9 @@ cmdbootstrap(int argc, char **argv)
        goversion = findgoversion();
        setup();
 
+       xsetenv("GOROOT", goroot);
+       xsetenv("GOROOT_FINAL", goroot_final);
+
        // For the main bootstrap, building for host os/arch.
        oldgoos = goos;
        oldgoarch = goarch;

diff --git a/src/cmd/gc/obj.c b/src/cmd/gc/obj.c
index aae566dbb8aae4f5d4a83dbfd14c69890ace5fa8..e45b4e0d44c94fb92c58c98eaa698b63d322cb50 100644 (file)
--- a/src/cmd/gc/obj.c
+++ b/src/cmd/gc/obj.c
@@ -126,10 +126,37 @@ outhist(Biobuf *b)
 {
        Hist *h;
        char *p, ds[] = {'c', ':', '/', 0};
+       char *tofree;
+       int n;
+       static int first = 1;
+       static char *goroot, *goroot_final;
 
+       if(first) {
+               // Decide whether we need to rewrite paths from $GOROOT to $GOROOT_FINAL.
+               first = 0;
+               goroot = getenv("GOROOT");
+               goroot_final = getenv("GOROOT_FINAL");
+               if(goroot == nil)
+                       goroot = "";
+               if(goroot_final == nil)
+                       goroot_final = goroot;
+               if(strcmp(goroot, goroot_final) == 0) {
+                       goroot = nil;
+                       goroot_final = nil;
+               }
+       }
+
+       tofree = nil;
        for(h = hist; h != H; h = h->link) {
                p = h->name;
                if(p) {
+                       if(goroot != nil) {
+                               n = strlen(goroot);
+                               if(strncmp(p, goroot, strlen(goroot)) == 0 && p[n] == '/') {
+                                       tofree = smprint("%s%s", goroot_final, p+n);
+                                       p = tofree;
+                               }
+                       }
                        if(windows) {
                                // if windows variable is set, then, we know already,
                                // pathname is started with windows drive specifier
@@ -161,9 +188,12 @@ outhist(Biobuf *b)
                                        outzfile(b, p);
                                }
                        }
-               
                }
                zhist(b, h->line, h->offset);
+               if(tofree) {
+                       free(tofree);
+                       tofree = nil;
+               }
        }
 }
 

diff --git a/test/run b/test/run
index 8acbc3d45ec3785e7833707add4a9c8370a2c692..302578eaaa7a6dc9af66f9b3a41cea79ba966eb8 100755 (executable)
--- a/test/run
+++ b/test/run
@@ -29,6 +29,8 @@ export GOTRACEBACK=0
 export LANG=C
 unset GREP_OPTIONS     # in case user has a non-standard set
 
+unset GOROOT_FINAL  # breaks ./ imports
+
 failed=0
 
 PATH=${GOBIN:-$GOROOT/bin}:`pwd`:/bin:/usr/bin:/usr/local/bin