From 5fd75810060e72ba9da44be85c7767417c8bbee7 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Thu, 5 Dec 2019 23:55:39 +0100 Subject: [PATCH] cmd/go: fix check for -Wp,-U in cgo CFLAGS There should be no space after comma. Change-Id: I6a5c85a386d9d1611b71d5b15a31a00c24c316b4 Reviewed-on: https://go-review.googlesource.com/c/go/+/210120 Run-TryBot: Tobias Klauser TryBot-Result: Gobot Gobot Reviewed-by: Ian Lance Taylor --- src/cmd/go/internal/work/security.go | 2 +- src/cmd/go/internal/work/security_test.go | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/cmd/go/internal/work/security.go b/src/cmd/go/internal/work/security.go index d02630155b..0ce1664c16 100644 --- a/src/cmd/go/internal/work/security.go +++ b/src/cmd/go/internal/work/security.go @@ -52,7 +52,7 @@ var validCompilerFlags = []*lazyregexp.Regexp{ re(`-W([^@,]+)`), // -Wall but not -Wa,-foo. re(`-Wa,-mbig-obj`), re(`-Wp,-D([A-Za-z_].*)`), - re(`-Wp, -U([A-Za-z_]*)`), + re(`-Wp,-U([A-Za-z_]*)`), re(`-ansi`), re(`-f(no-)?asynchronous-unwind-tables`), re(`-f(no-)?blocks`), diff --git a/src/cmd/go/internal/work/security_test.go b/src/cmd/go/internal/work/security_test.go index 3a02db1d04..6b85c40b13 100644 --- a/src/cmd/go/internal/work/security_test.go +++ b/src/cmd/go/internal/work/security_test.go @@ -22,6 +22,8 @@ var goodCompilerFlags = [][]string{ {"-Osmall"}, {"-W"}, {"-Wall"}, + {"-Wp,-Dfoo=bar"}, + {"-Wp,-Ufoo"}, {"-fobjc-arc"}, {"-fno-objc-arc"}, {"-fomit-frame-pointer"}, -- 2.50.0