Commit a941c285 authored by Duncan Coutts's avatar Duncan Coutts
Browse files

Fix parsing of ld,cc,cpp-options for flags containing ','

The ',' character is not used as a separator and is allowed
within flag tokens. Fixes at least HsPerl5.
parent 4068e063
......@@ -218,13 +218,13 @@ binfoFieldDescrs =
disp parseBuildTool
buildTools (\xs binfo -> binfo{buildTools=xs})
, spaceListField "cpp-options"
showToken parseTokenQ
showToken parseTokenQ'
cppOptions (\val binfo -> binfo{cppOptions=val})
, spaceListField "cc-options"
showToken parseTokenQ
showToken parseTokenQ'
ccOptions (\val binfo -> binfo{ccOptions=val})
, spaceListField "ld-options"
showToken parseTokenQ
showToken parseTokenQ'
ldOptions (\val binfo -> binfo{ldOptions=val})
, commaListField "pkgconfig-depends"
disp parsePkgconfigDependency
......
......@@ -54,7 +54,7 @@ module Distribution.ParseUtils (
Field(..), fName, lineNo,
FieldDescr(..), ppField, ppFields, readFields,
showFields, showSingleNamedField, parseFields,
parseFilePathQ, parseTokenQ,
parseFilePathQ, parseTokenQ, parseTokenQ',
parseModuleNameQ, parseBuildTool, parsePkgconfigDependency,
parseOptVersion, parsePackageNameQ, parseVersionRangeQ,
parseTestedWithQ, parseLicenseQ, parseExtensionQ,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment