diff --git a/builder.go b/builder.go index 520019c..e4eef59 100644 --- a/builder.go +++ b/builder.go @@ -88,7 +88,7 @@ func (b Builder) Build(ctx context.Context, outputFile string) error { raceArg := "-race" // trim debug symbols by default - buildFlags := b.osEnvOrDefaultValue("XK6_BUILD_FLAGS", "-ldflags='-w -s'") + buildFlags := b.osEnvOrDefaultValue("XK6_BUILD_FLAGS", "-ldflags='-w -s' -trimpath") buildFlagsSlice := buildCommandArgs(buildFlags, absOutputFile) @@ -297,7 +297,6 @@ func buildCommandArgs(buildFlags, absOutputFile string) []string { } buildFlagsSlice = append(buildFlagsSlice, tmp...) - buildFlagsSlice = append(buildFlagsSlice, "-trimpath") return buildFlagsSlice } diff --git a/builder_test.go b/builder_test.go index 68b5c08..e4fe523 100644 --- a/builder_test.go +++ b/builder_test.go @@ -100,31 +100,31 @@ func TestBuildCommandArgs(t *testing.T) { { buildFlags: "", want: []string{ - "build", "-o", "binfile", "-trimpath", + "build", "-o", "binfile", }, }, { buildFlags: "-ldflags='-w -s'", want: []string{ - "build", "-o", "binfile", "-ldflags=-w -s", "-trimpath", + "build", "-o", "binfile", "-ldflags=-w -s", }, }, { buildFlags: "-race -buildvcs=false", want: []string{ - "build", "-o", "binfile", "-race", "-buildvcs=false", "-trimpath", + "build", "-o", "binfile", "-race", "-buildvcs=false", }, }, { buildFlags: `-buildvcs=false -ldflags="-s -w" -race`, want: []string{ - "build", "-o", "binfile", "-buildvcs=false", "-ldflags=-s -w", "-race", "-trimpath", + "build", "-o", "binfile", "-buildvcs=false", "-ldflags=-s -w", "-race", }, }, { buildFlags: `-ldflags="-s -w" -race -buildvcs=false`, want: []string{ - "build", "-o", "binfile", "-ldflags=-s -w", "-race", "-buildvcs=false", "-trimpath", + "build", "-o", "binfile", "-ldflags=-s -w", "-race", "-buildvcs=false", }, }, }