[Git][ghc/ghc][wip/hadrian-cross-stage2] 2 commits: Fix libdir

[Matthew Pickering (@mpickering)]

Matthew Pickering pushed to branch wip/hadrian-cross-stage2 at Glasgow Haskell Compiler / GHC


Commits:
3e88ba82 by Matthew Pickering at 2023-10-12T15:15:55+01:00
Fix libdir

- - - - -
70f66d4b by Matthew Pickering at 2023-10-13T14:13:08+01:00
SMP fix

- - - - -


2 changed files:

- hadrian/src/Settings/Builders/RunTest.hs
- m4/fp_settings.m4


Changes:

=====================================
hadrian/src/Settings/Builders/RunTest.hs
=====================================
@@ -166,9 +166,7 @@ outOfTreeCompilerArgs = do
     withInterpreter     <- getBooleanSetting TestGhcWithInterpreter
     unregisterised      <- getBooleanSetting TestGhcUnregisterised
     tables_next_to_code <- getBooleanSetting TestGhcTablesNextToCode
-    -- MP: Wrong
---    targetWithSMP       <- targetSupportsSMP stage
-    let targetWithSMP   = True
+    targetWithSMP       <- getBooleanSetting TestGhcWithSMP
 
     debugAssertions     <- getBooleanSetting TestGhcDebugAssertions
 


=====================================
m4/fp_settings.m4
=====================================
@@ -75,7 +75,7 @@ AC_DEFUN([FP_SETTINGS],
     fi
 
     if test "$HostOS" = "mingw32"; then
-        SettingsTouchCommand='$$topdir/bin/touchy.exe'
+        SettingsTouchCommand='$$topdir/../bin/touchy.exe'
     else
         SettingsTouchCommand='touch'
     fi
@@ -109,7 +109,7 @@ AC_DEFUN([FP_SETTINGS],
         SUBST_TOOLDIR([SettingsArCommand])
         SUBST_TOOLDIR([SettingsRanlibCommand])
         SUBST_TOOLDIR([SettingsWindresCommand])
-        SettingsTouchCommand='$$topdir/bin/touchy.exe'
+        SettingsTouchCommand='$$topdir/../bin/touchy.exe'
     fi
 
     # LLVM backend tools



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/a17827a405c5731a469b8e6adde25dd85ad474d2...70f66d4b25c4ecc889930a6a7e175869c8dd72a2

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/a17827a405c5731a469b8e6adde25dd85ad474d2...70f66d4b25c4ecc889930a6a7e175869c8dd72a2
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20231013/babf4070/attachment-0001.html>