[Git][ghc/ghc][wip/romes/24792] 2 commits: dist: Don't forget to configure JavascriptCPP

[Rodrigo Mesquita (@alt-romes)]

Rodrigo Mesquita pushed to branch wip/romes/24792 at Glasgow Haskell Compiler / GHC


Commits:
5eb84580 by Rodrigo Mesquita at 2024-06-18T17:40:11+01:00
dist: Don't forget to configure JavascriptCPP

We introduced a configuration step for the javascript preprocessor, but
only did so for the in-tree configure script.

This commit makes it so that we also configure the javascript
preprocessor in the configure shipped in the compiler bindist.

- - - - -
bd998183 by Rodrigo Mesquita at 2024-06-18T17:46:59+01:00
distrib: LlvmTarget in distrib/configure

LlvmTarget was being set and substituted in the in-tree configure, but
not in the configure shipped in the bindist.

We want to set the LlvmTarget to the canonical LLVM name of the platform
that GHC is targetting.

Currently, that is going to be the boostrapped llvm target (hence the
code which sets LlvmTarget=bootstrap_llvm_target).

- - - - -


1 changed file:

- distrib/configure.ac.in


Changes:

=====================================
distrib/configure.ac.in
=====================================
@@ -151,6 +151,11 @@ FP_HSCPP_CMD_WITH_ARGS(HaskellCPPCmd, HaskellCPPArgs)
 AC_SUBST([HaskellCPPCmd])
 AC_SUBST([HaskellCPPArgs])
 
+# --with-js-cpp/--with-js-cpp-flags
+FP_JSCPP_CMD_WITH_ARGS(JavaScriptCPPCmd, JavaScriptCPPArgs)
+AC_SUBST([JavaScriptCPPCmd])
+AC_SUBST([JavaScriptCPPArgs])
+
 # --with-cmm-cpp/--with-cmm-cpp-flags
 FP_CMM_CPP_CMD_WITH_ARGS([$CC], [CmmCPPCmd], [CmmCPPArgs], [CmmCPPSupportsG0])
 AC_SUBST([CmmCPPCmd])
@@ -288,6 +293,9 @@ AC_SUBST(TargetHasIdentDirective)
 GHC_GNU_NONEXEC_STACK
 AC_SUBST(TargetHasGnuNonexecStack)
 
+GHC_LLVM_TARGET_SET_VAR
+AC_SUBST(LlvmTarget)
+
 dnl ** See whether cc supports --target=<triple> and set
 dnl CONF_CC_OPTS_STAGE[12] accordingly.
 FP_CC_SUPPORTS_TARGET([$CC], [CONF_CC_OPTS_STAGE1], [CONF_CXX_OPTS_STAGE1])



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/d0ac40dd004dce1ea413bcddfbfc2de82eecdd64...bd9981839bc79f2a72cb8ebfa995361e7e43d2dd

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/d0ac40dd004dce1ea413bcddfbfc2de82eecdd64...bd9981839bc79f2a72cb8ebfa995361e7e43d2dd
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/20240618/ae6b8192/attachment-0001.html>