diff --git a/pkg/build/gobuild.go b/pkg/build/gobuild.go index 9ff2f8a5e3..f3e2672b00 100644 --- a/pkg/build/gobuild.go +++ b/pkg/build/gobuild.go @@ -686,7 +686,7 @@ func (g *gobuild) configForImportPath(ip string) Config { config, ok := g.buildConfigs[ip] if !ok { // Apply default build flags in case none were supplied - config.Flags = addGo113TrimPathFlag(config.Flags) + config.Flags = append(config.Flags, "-trimpath") } if g.disableOptimizations { diff --git a/pkg/build/trimpath_113.go b/pkg/build/trimpath_113.go deleted file mode 100644 index 0eff2a36d4..0000000000 --- a/pkg/build/trimpath_113.go +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright 2018 Google LLC All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// -// house flag adding function for go1.13 and later version with -trimpath available -// +build go1.13 - -package build - -func addGo113TrimPathFlag(args []string) []string { - return append(args, "-trimpath") -} diff --git a/pkg/build/trimpath_pre113.go b/pkg/build/trimpath_pre113.go deleted file mode 100644 index 706aa9a16e..0000000000 --- a/pkg/build/trimpath_pre113.go +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright 2018 Google LLC All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// -// house placeholder function for go1.12 and earlier version without -trimpath -// +build !go1.13 - -package build - -func addGo113TrimPathFlag(args []string) []string { - return args -}