Skip to content

xtool/safesplit:properly handle consecutive short flags #1243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xushiwei merged 1 commit into from
Aug 28, 2025
Merged

xtool/safesplit:properly handle consecutive short flags #1243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions internal/clang/clang_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,12 @@ func TestFlagMergingScenarios(t *testing.T) {
expectComp: []string{"-O3", "-fPIC", "-Wall", "-Wextra", "-std=c11"},
expectLink: []string{"-O3", "-lm", "-lpthread", "-static"},
},
{
// case from https://github.com/goplus/llgo/issues/1244
name: "issue 1244",
envCFlags: "-w -pipe -mmacosx-version-min=15 -isysroot/Library/Developer/CommandLineTools/SDKs/MacOSX15.sdk",
expectComp: []string{"-w", "-pipe", "-mmacosx-version-min=15", "-isysroot/Library/Developer/CommandLineTools/SDKs/MacOSX15.sdk"},
},
}

// Save original environment
Expand Down
7 changes: 7 additions & 0 deletions xtool/safesplit/safesplit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,13 @@ func SplitPkgConfigFlags(s string) []string {
for i < len(s) && (s[i] == ' ' || s[i] == '\t') {
i++
}

// Check if next character is another flag (short flag with no argument)
if i < len(s) && s[i] == '-' {
// This is a short flag with no argument, finish current flag
continue
}

// Read content until next space
for i < len(s) {
if s[i] == '\\' && i+1 < len(s) && (s[i+1] == ' ' || s[i+1] == '\t') {
Expand Down
12 changes: 9 additions & 3 deletions xtool/safesplit/safesplit_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,16 @@ func TestSplitPkgConfigFlags(t *testing.T) {
})

t.Run("consecutive_flags", func(t *testing.T) {
ftest("-I -L", `["-I-L"]`)
ftest("-I -L /usr/lib", `["-I-L /usr/lib"]`)
ftest("-I -L", `["-I" "-L"]`)
ftest("-I -L /usr/lib", `["-I" "-L/usr/lib"]`)
})

t.Run("edge_cases", func(t *testing.T) {
ftest("", "[]")
ftest(" ", "[]")
ftest("-", `["-"]`)
ftest("-I", `["-I"]`)
ftest("-I -", `["-I-"]`)
ftest("-I -", `["-I" "-"]`)
})

t.Run("escaped_spaces", func(t *testing.T) {
Expand All @@ -77,6 +77,12 @@ func TestSplitPkgConfigFlags(t *testing.T) {
ftest("-DVERSION=2.1 -DDEBUG=1", `["-DVERSION=2.1" "-DDEBUG=1"]`)
ftest("-D VERSION=2.1 -D DEBUG=1", `["-DVERSION=2.1" "-DDEBUG=1"]`)
})

// case for https://github.com/goplus/llgo/issues/1244
t.Run("w_pipe", func(t *testing.T) {
ftest("-w -pipe", `["-w" "-pipe"]`)
ftest("-Os -w -pipe", `["-Os" "-w" "-pipe"]`)
})
}

func toString(ss []string) string {
Expand Down
Loading