qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-25 08:57:58 -07:00
Code Releases Activity

cmd/dist: Plan 9 build needs an additional include path

Browse Source 
cmd/cc: bv.c imports libc.h twice

When using the Plan 9 compiler, the invocation

        #include <../ld/textflag.h>

works for the toolchain, but not for the MACH library.

Module cmd/cc/bv.c includes libc.h and "cc.h", which in
turn also includes libc.h.  In the Plan 9 context, this
causes a number of duplicate definitions.

R=golang-dev, rsc, r
CC=golang-dev
https://golang.org/cl/13303047
This commit is contained in:
Lucio De Re 2013-09-06 16:15:44 +10:00 committed by Rob Pike
parent 6833d1b436
commit fd7ddad160
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/cmd/cc/bv.c
View File

@ -3,7 +3,6 @@
// license that can be found in the LICENSE file. // license that can be found in the LICENSE file.
#include <u.h> #include <u.h>
#include <libc.h>
#include "cc.h" #include "cc.h"
enum { enum {

2
src/cmd/dist/build.c vendored
View File

@ -932,6 +932,8 @@ install(char *dir)
vadd(&compile, "-Bp+"); vadd(&compile, "-Bp+");
vadd(&compile, bpathf(&b, "-I%s/include/plan9", goroot)); vadd(&compile, bpathf(&b, "-I%s/include/plan9", goroot));
vadd(&compile, bpathf(&b, "-I%s/include/plan9/%s", goroot, gohostarch)); vadd(&compile, bpathf(&b, "-I%s/include/plan9/%s", goroot, gohostarch));
// Work around Plan 9 C compiler's handling of #include with .. path.
vadd(&compile, bpathf(&b, "-I%s/src/cmd/ld", goroot));
} else { } else {
vcopy(&compile, gccargs.p, gccargs.len); vcopy(&compile, gccargs.p, gccargs.len);
vadd(&compile, "-c"); vadd(&compile, "-c");