[go] cmd/dist: support spaces and quotes in CC
Gerrit Bot (Gerrit)
Gerrit Bot has uploaded this change for review.
cmd/dist: support spaces and quotes in CC
As of 742dcba7bb953a96c9f3fcdeb32b1c03cbbd8d5e `go build` can accept `$CC` with spaces and quotes, which lets us easily use `zig cc` as the C compiler, or easily pass extra compiler parameters:
```
CC="zig cc" go build <...>
CC="clang-13 -v" go build <...>
CC="zig cc -Wl,--print-gc-sections" go build <...>
```
However, the same does not apply for building go itself:
```
$ CC="zig cc" ./make.bash
Building Go cmd/dist using /usr/local/go. (go1.18.2 linux/amd64)
go tool dist: cannot invoke C compiler "zig cc": exec: "zig cc": executable file not found in $PATH
Go needs a system C compiler for use with cgo.
To set a C compiler, set CC=the-compiler.
To disable cgo, set CGO_ENABLED=0.
```
With this change Go can be built directly with `zig cc` (the linker arg will disappear with #52815 and/or #52690):
```
$ CC="zig cc -Wl,--no-gc-sections" ./make.bash
Building Go cmd/dist using /usr/local/go. (go1.18.2 linux/amd64)
Building Go toolchain1 using /usr/local/go.
Building Go bootstrap cmd/go (go_bootstrap) using Go toolchain1.
Building Go toolchain2 using go_bootstrap and Go toolchain1.
Building Go toolchain3 using go_bootstrap and Go toolchain2.
Building packages and commands for linux/amd64.
---
Installed Go for linux/amd64 in /home/motiejus/code/go
Installed commands in /home/motiejus/code/go/bin
$ ../bin/go version
go version devel go1.19-811f1913a8 Thu May 19 09:44:49 2022 +0300 linux/amd64
```
Fixes #52990
Change-Id: I66b3525d47db488d3c583c1aee3af78060fd5a38
GitHub-Last-Rev: f60bf32bbdbc4158bda92c32188bff50c4f09cc6
GitHub-Pull-Request: golang/go#52991
---
M src/cmd/dist/build.go
A src/cmd/dist/quoted.go
M src/cmd/internal/quoted/quoted.go
3 files changed, 109 insertions(+), 2 deletions(-)
diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go
index f99f1f4..e7ba8a0 100644
--- a/src/cmd/dist/build.go
+++ b/src/cmd/dist/build.go
@@ -1631,7 +1631,13 @@
if !needCC() {
return
}
- if output, err := exec.Command(defaultcc[""], "--help").CombinedOutput(); err != nil {
+ cc, err := quotedSplit(defaultcc[""])
+ if err != nil {
+ fatalf("split CC: %v", err)
+ }
+ var ccHelp = append(cc, "--help")
+
+ if output, err := exec.Command(ccHelp[0], ccHelp[1:]...).CombinedOutput(); err != nil {
outputHdr := ""
if len(output) > 0 {
outputHdr = "\nCommand output:\n\n"
@@ -1639,7 +1645,7 @@
fatalf("cannot invoke C compiler %q: %v\n\n"+
"Go needs a system C compiler for use with cgo.\n"+
"To set a C compiler, set CC=the-compiler.\n"+
- "To disable cgo, set CGO_ENABLED=0.\n%s%s", defaultcc[""], err, outputHdr, output)
+ "To disable cgo, set CGO_ENABLED=0.\n%s%s", cc, err, outputHdr, output)
}
}
diff --git a/src/cmd/dist/quoted.go b/src/cmd/dist/quoted.go
new file mode 100644
index 0000000..e87b8a3
--- /dev/null
+++ b/src/cmd/dist/quoted.go
@@ -0,0 +1,49 @@
+package main
+
+import "fmt"
+
+// quotedSplit is a verbatim copy from cmd/internal/quoted.go:Split and its
+// dependencies (isSpaceByte). Since this package is built using the host's
+// Go compiler, it cannot use `cmd/internal/...`. We also don't want to export
+// it to all Go users.
+//
+// Please keep those in sync.
+func quotedSplit(s string) ([]string, error) {
+ // Split fields allowing '' or "" around elements.
+ // Quotes further inside the string do not count.
+ var f []string
+ for len(s) > 0 {
+ for len(s) > 0 && isSpaceByte(s[0]) {
+ s = s[1:]
+ }
+ if len(s) == 0 {
+ break
+ }
+ // Accepted quoted string. No unescaping inside.
+ if s[0] == '"' || s[0] == '\'' {
+ quote := s[0]
+ s = s[1:]
+ i := 0
+ for i < len(s) && s[i] != quote {
+ i++
+ }
+ if i >= len(s) {
+ return nil, fmt.Errorf("unterminated %c string", quote)
+ }
+ f = append(f, s[:i])
+ s = s[i+1:]
+ continue
+ }
+ i := 0
+ for i < len(s) && !isSpaceByte(s[i]) {
+ i++
+ }
+ f = append(f, s[:i])
+ s = s[i:]
+ }
+ return f, nil
+}
+
+func isSpaceByte(c byte) bool {
+ return c == ' ' || c == '\t' || c == '\n' || c == '\r'
+}
diff --git a/src/cmd/internal/quoted/quoted.go b/src/cmd/internal/quoted/quoted.go
index e7575df..b3d3c40 100644
--- a/src/cmd/internal/quoted/quoted.go
+++ b/src/cmd/internal/quoted/quoted.go
@@ -20,6 +20,8 @@
// allowing single or double quotes around elements.
// There is no unescaping or other processing within
// quoted fields.
+//
+// Keep in sync with cmd/dist/quoted.go
func Split(s string) ([]string, error) {
// Split fields allowing '' or "" around elements.
// Quotes further inside the string do not count.
To view, visit change 407216. To unsubscribe, or for help writing mail filters, visit settings.
Motiejus Jakštys (Gerrit)
1 comment:
Patchset:
+ Jay Conrod, author of the commit that made CC-with-spaces possible in the first place.
To view, visit change 407216. To unsubscribe, or for help writing mail filters, visit settings.
Ian Lance Taylor (Gerrit)
Attention is currently required from: Austin Clements, Russ Cox.
Patch set 1:Run-TryBot +1
1 comment:
Commit Message:
Patch Set #1, Line 9:
As of 742dcba7bb953a96c9f3fcdeb32b1c03cbbd8d5e `go build` can accept `$CC` with spaces and quotes, which lets us easily use `zig cc` as the C compiler, or easily pass extra compiler parameters:Instead of he git revision please write "CL 334732". Please also break this long line around 76 characters or so. Thanks.
To view, visit change 407216. To unsubscribe, or for help writing mail filters, visit settings.
Ian Lance Taylor (Gerrit)
Attention is currently required from: Austin Clements, Russ Cox.
Patch set 1:Run-TryBot +1Auto-Submit +1Code-Review +2
1 comment:
Patchset:
Thanks.
To view, visit change 407216. To unsubscribe, or for help writing mail filters, visit settings.
Motiejus Jakštys (Gerrit)
Attention is currently required from: Austin Clements, Ian Lance Taylor, Russ Cox.
1 comment:
Commit Message:
Patch Set #1, Line 9:
As of 742dcba7bb953a96c9f3fcdeb32b1c03cbbd8d5e `go build` can accept `$CC` with spaces and quotes, which lets us easily use `zig cc` as the C compiler, or easily pass extra compiler parameters:
Instead of he git revision please write "CL 334732". […]
Done
To view, visit change 407216. To unsubscribe, or for help writing mail filters, visit settings.
Gerrit Bot (Gerrit)
Attention is currently required from: Austin Clements, Ian Lance Taylor, Ian Lance Taylor, Russ Cox.
Gerrit Bot uploaded patch set #2 to this change.
The following approvals got outdated and were removed: Auto-Submit+1 by Ian Lance Taylor, Run-TryBot+1 by Ian Lance Taylor, Run-TryBot+1 by Ian Lance Taylor, TryBot-Result+1 by Gopher Robot
cmd/dist: support spaces and quotes in CC
cmd/dist: support spaces and quotes in CC
As of CL 334732 `go build` can accept `$CC` with spaces and quotes,
which lets us easily use `zig cc` as the C compiler, or easily pass
extra compiler parameters:
GitHub-Last-Rev: 39d51c4a6b2bdf64f08c7a5575fa268094f0ab07
GitHub-Pull-Request: golang/go#52991
---
M src/cmd/dist/build.go
A src/cmd/dist/quoted.go
M src/cmd/internal/quoted/quoted.go
3 files changed, 114 insertions(+), 2 deletions(-)
To view, visit change 407216. To unsubscribe, or for help writing mail filters, visit settings.
Gerrit Bot (Gerrit)
Attention is currently required from: Austin Clements, Ian Lance Taylor, Ian Lance Taylor, Russ Cox.
Gerrit Bot uploaded patch set #3 to this change.
cmd/dist: support spaces and quotes in CC
As of CL 334732 `go build` can accept `$CC` with spaces and quotes,
which lets us easily use `zig cc` as the C compiler, or easily pass
extra compiler parameters:
```
CC="zig cc" go build <...>
CC="clang-13 -v" go build <...>
CC="zig cc -Wl,--print-gc-sections" go build <...>
```
However, the same does not apply for building go itself:
```
$ CC="zig cc" ./make.bash
Building Go cmd/dist using /usr/local/go. (go1.18.2 linux/amd64)
go tool dist: cannot invoke C compiler "zig cc": exec: "zig cc": executable file not found in $PATH
Go needs a system C compiler for use with cgo.
To set a C compiler, set CC=the-compiler.
To disable cgo, set CGO_ENABLED=0.
```
With this change Go can be built directly with `zig cc` (the linker arg
will disappear with CL 405414):
```
$ CC="zig cc -Wl,--no-gc-sections" ./make.bash
Building Go cmd/dist using /usr/local/go. (go1.18.2 linux/amd64)
Building Go toolchain1 using /usr/local/go.
Building Go bootstrap cmd/go (go_bootstrap) using Go toolchain1.
Building Go toolchain2 using go_bootstrap and Go toolchain1.
Building Go toolchain3 using go_bootstrap and Go toolchain2.
Building packages and commands for linux/amd64.
---
Installed Go for linux/amd64 in /home/motiejus/code/go
Installed commands in /home/motiejus/code/go/bin
$ ../bin/go version
go version devel go1.19-811f1913a8 Thu May 19 09:44:49 2022 +0300 linux/amd64
```
Fixes #52990
Change-Id: I66b3525d47db488d3c583c1aee3af78060fd5a38
GitHub-Last-Rev: ecc70d722406f0c7d0c1930c872db392e80e7cf5
GitHub-Pull-Request: golang/go#52991
---
M src/cmd/dist/build.go
A src/cmd/dist/quoted.go
M src/cmd/internal/quoted/quoted.go
3 files changed, 112 insertions(+), 2 deletions(-)
To view, visit change 407216. To unsubscribe, or for help writing mail filters, visit settings.
Ian Lance Taylor (Gerrit)
Attention is currently required from: Austin Clements, Ian Lance Taylor, Russ Cox.
Patch set 3:Run-TryBot +1Auto-Submit +1Code-Review +2
To view, visit change 407216. To unsubscribe, or for help writing mail filters, visit settings.
Ian Lance Taylor (Gerrit)
Attention is currently required from: Austin Clements, Russ Cox.
1 comment:
Patchset:
Trybot failure can't be related to this change.
To view, visit change 407216. To unsubscribe, or for help writing mail filters, visit settings.
Ian Lance Taylor (Gerrit)
Attention is currently required from: Austin Clements, Ian Lance Taylor, Russ Cox.
Patch set 4:Run-TryBot +1Auto-Submit +1Code-Review +2
To view, visit change 407216. To unsubscribe, or for help writing mail filters, visit settings.
Alex Rakoczy (Gerrit)
Attention is currently required from: Austin Clements, Ian Lance Taylor, Russ Cox.
Patch set 4:Code-Review +1
Gopher Robot (Gerrit)
Gopher Robot submitted this change.
Reviewed-on: https://go-review.googlesource.com/c/go/+/407216
Reviewed-by: Ian Lance Taylor <ia...@google.com>
Run-TryBot: Ian Lance Taylor <ia...@google.com>
Auto-Submit: Ian Lance Taylor <ia...@google.com>
Reviewed-by: Alex Rakoczy <al...@golang.org>
TryBot-Result: Gopher Robot <go...@golang.org>
---
M src/cmd/dist/build.go
A src/cmd/dist/quoted.go
M src/cmd/internal/quoted/quoted.go
3 files changed, 118 insertions(+), 2 deletions(-)
diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go
index 0a7af2b..7c44c4a 100644
--- a/src/cmd/dist/build.go
+++ b/src/cmd/dist/build.go
@@ -1630,7 +1630,13 @@
if !needCC() {
return
}
- if output, err := exec.Command(defaultcc[""], "--help").CombinedOutput(); err != nil {
+ cc, err := quotedSplit(defaultcc[""])
+ if err != nil {
+ fatalf("split CC: %v", err)
+ }
+ var ccHelp = append(cc, "--help")
+
+ if output, err := exec.Command(ccHelp[0], ccHelp[1:]...).CombinedOutput(); err != nil {
outputHdr := ""
if len(output) > 0 {
outputHdr = "\nCommand output:\n\n"
@@ -1638,7 +1644,7 @@To view, visit change 407216. To unsubscribe, or for help writing mail filters, visit settings.