Skip to content

Commit 2665f3f

Browse files
committed
Don't build js sources for executables on non-js hosts
1 parent 06dc276 commit 2665f3f

File tree

1 file changed

+5
-2
lines changed
  • Cabal/src/Distribution/Simple

1 file changed

+5
-2
lines changed

Cabal/src/Distribution/Simple/GHC.hs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1586,11 +1586,14 @@ gbuild verbosity numJobs pkg_descr lbi bm clbi = do
15861586
dynamicTooSupported = supportsDynamicToo comp
15871587
cLikeObjs = map (`replaceExtension` objExtension) cSrcs
15881588
cxxObjs = map (`replaceExtension` objExtension) cxxSrcs
1589-
jsObjs = map (`replaceExtension` objExtension) jsSrcs
1589+
jsObjs = if hasJsSupport then map (`replaceExtension` objExtension) jsSrcs else []
15901590
asmObjs = map (`replaceExtension` objExtension) asmSrcs
15911591
cmmObjs = map (`replaceExtension` objExtension) cmmSrcs
15921592
needDynamic = gbuildNeedDynamic lbi bm
15931593
needProfiling = withProfExe lbi
1594+
Platform hostArch _ = hostPlatform lbi
1595+
hasJsSupport = hostArch == JavaScript
1596+
15941597

15951598
-- build executables
15961599
baseOpts =
@@ -1816,7 +1819,7 @@ gbuild verbosity numJobs pkg_descr lbi bm clbi = do
18161819
buildExtraSources Internal.componentCcGhcOptions True cSrcs
18171820

18181821
-- build any JS sources
1819-
unless (null $ jsSourceFiles buildSources) $ do
1822+
unless (not hasJsSupport || null (jsSourceFiles buildSources)) $ do
18201823
info verbosity "Building JS Sources..."
18211824
buildExtraSources Internal.componentJsGhcOptions False jsSrcs
18221825

0 commit comments

Comments
 (0)