Skip to content

Commit

Permalink
Merge branch 'bugfix/macos_build' into 'master'
Browse files Browse the repository at this point in the history
fix kconfig build on macOS

macOS version of sed doesn't recognize \r as special character.
Replacing with \x0D substitution which works everywhere.

See merge request !96
  • Loading branch information
projectgus committed Sep 20, 2016
2 parents d09a79c + f5f625e commit af82eed
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion tools/kconfig/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ zconf.lex.c: zconf.l

zconf.hash.c: zconf.gperf
# strip CRs on Windows systems where gperf will otherwise barf on them
sed -E "s/\r//" zconf.gperf | gperf -t --output-file zconf.hash.c -a -C -E -g -k '1,3,$$' -p -t
sed -E "s/\\x0D$$//" zconf.gperf | gperf -t --output-file zconf.hash.c -a -C -E -g -k '1,3,$$' -p -t

zconf.tab.c: zconf.y
bison -t -l -p zconf -o zconf.tab.c zconf.y
Expand Down

0 comments on commit af82eed

Please sign in to comment.