diff options
Diffstat (limited to 'hadrian')
| -rw-r--r-- | hadrian/bindist/config.mk.in | 2 | ||||
| -rw-r--r-- | hadrian/src/Oracles/Flag.hs | 4 | ||||
| -rw-r--r-- | hadrian/src/Oracles/Setting.hs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/hadrian/bindist/config.mk.in b/hadrian/bindist/config.mk.in index ee8366a26f..cad2ccc6e0 100644 --- a/hadrian/bindist/config.mk.in +++ b/hadrian/bindist/config.mk.in @@ -128,7 +128,7 @@ GhcUnregisterised = @Unregisterised@ ifeq "$(TargetArch_CPP)" "arm" # We don't support load/store barriers pre-ARMv7. See #10433. ArchSupportsSMP=$(if $(filter $(ARM_ISA),ARMv5 ARMv6),NO,YES) -else ifeq "$(TargetArch_CPP)" "js" +else ifeq "$(TargetArch_CPP)" "javascript" ArchSupportsSMP=NO else ArchSupportsSMP=$(strip $(patsubst $(TargetArch_CPP), YES, $(findstring $(TargetArch_CPP), i386 x86_64 sparc powerpc powerpc64 powerpc64le s390x aarch64 riscv64))) diff --git a/hadrian/src/Oracles/Flag.hs b/hadrian/src/Oracles/Flag.hs index d3baec4932..3f7a2c4551 100644 --- a/hadrian/src/Oracles/Flag.hs +++ b/hadrian/src/Oracles/Flag.hs @@ -100,14 +100,14 @@ platformSupportsSharedLibs = do wasm <- anyTargetArch [ "wasm32" ] ppc_linux <- anyTargetPlatform [ "powerpc-unknown-linux" ] solaris <- anyTargetPlatform [ "i386-unknown-solaris2" ] - javascript <- anyTargetArch [ "js" ] + javascript <- anyTargetArch [ "javascript" ] solarisBroken <- flag SolarisBrokenShld return $ not (windows || wasm || javascript || ppc_linux || solaris && solarisBroken) -- | Does the target support threaded RTS? targetSupportsThreadedRts :: Action Bool targetSupportsThreadedRts = do - bad_arch <- anyTargetArch [ "wasm32", "js" ] + bad_arch <- anyTargetArch [ "wasm32", "javascript" ] return $ not bad_arch -- | Does the target support the -N RTS flag? diff --git a/hadrian/src/Oracles/Setting.hs b/hadrian/src/Oracles/Setting.hs index e064d7a5c1..462d289cd0 100644 --- a/hadrian/src/Oracles/Setting.hs +++ b/hadrian/src/Oracles/Setting.hs @@ -258,7 +258,7 @@ isWinTarget :: Action Bool isWinTarget = anyTargetOs ["mingw32"] isJsTarget :: Action Bool -isJsTarget = anyTargetArch ["js"] +isJsTarget = anyTargetArch ["javascript"] isOsxTarget :: Action Bool isOsxTarget = anyTargetOs ["darwin"] |