File tree Expand file tree Collapse file tree 4 files changed +10
-0
lines changed
Cabal/src/Distribution/Simple/GHC
Cabal-syntax/src/Distribution Expand file tree Collapse file tree 4 files changed +10
-0
lines changed Original file line number Diff line number Diff line change @@ -621,6 +621,7 @@ buildInfoFieldGrammar =
621
621
<*> monoidalFieldAla " cc-options" (alaList' NoCommaFSep Token' ) L. ccOptions
622
622
<*> monoidalFieldAla " cxx-options" (alaList' NoCommaFSep Token' ) L. cxxOptions
623
623
^^^ availableSince CabalSpecV2_2 []
624
+ <*> monoidalFieldAla " js-options" (alaList' NoCommaFSep Token' ) L. jsOptions
624
625
<*> monoidalFieldAla " ld-options" (alaList' NoCommaFSep Token' ) L. ldOptions
625
626
<*> monoidalFieldAla " hsc2hs-options" (alaList' NoCommaFSep Token' ) L. hsc2hsOptions
626
627
^^^ availableSince CabalSpecV3_6 []
Original file line number Diff line number Diff line change @@ -61,6 +61,8 @@ data BuildInfo = BuildInfo
61
61
-- ^ options for C compiler
62
62
, cxxOptions :: [String ]
63
63
-- ^ options for C++ compiler
64
+ , jsOptions :: [String ]
65
+ -- ^ options for pre-processing JavaScript code
64
66
, ldOptions :: [String ]
65
67
-- ^ options for linker
66
68
, hsc2hsOptions :: [String ]
@@ -161,6 +163,7 @@ instance Monoid BuildInfo where
161
163
, cmmOptions = []
162
164
, ccOptions = []
163
165
, cxxOptions = []
166
+ , jsOptions = []
164
167
, ldOptions = []
165
168
, hsc2hsOptions = []
166
169
, pkgconfigDepends = []
@@ -214,6 +217,7 @@ instance Semigroup BuildInfo where
214
217
, cmmOptions = combine cmmOptions
215
218
, ccOptions = combine ccOptions
216
219
, cxxOptions = combine cxxOptions
220
+ , jsOptions = combine jsOptions
217
221
, ldOptions = combine ldOptions
218
222
, hsc2hsOptions = combine hsc2hsOptions
219
223
, pkgconfigDepends = combine pkgconfigDepends
Original file line number Diff line number Diff line change @@ -59,6 +59,10 @@ class HasBuildInfo a where
59
59
cxxOptions = buildInfo . cxxOptions
60
60
{-# INLINE cxxOptions #-}
61
61
62
+ jsOptions :: Lens' a [String ]
63
+ jsOptions = buildInfo . jsOptions
64
+ {-# INLINE jsOptions #-}
65
+
62
66
ldOptions :: Lens' a [String ]
63
67
ldOptions = buildInfo . ldOptions
64
68
{-# INLINE ldOptions #-}
Original file line number Diff line number Diff line change @@ -489,6 +489,7 @@ componentJsGhcOptions verbosity lbi bi clbi odir filename =
489
489
, ghcOptPackageDBs = withPackageDB lbi
490
490
, ghcOptPackages = toNubListR $ mkGhcOptPackages (promisedPkgs lbi) clbi
491
491
, ghcOptObjDir = toFlag odir
492
+ , ghcOptExtra = jsOptions bi
492
493
}
493
494
494
495
componentGhcOptions
You can’t perform that action at this time.
0 commit comments