diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-10-17 18:38:00 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-10-29 20:31:36 -0400 |
| commit | 3c0372d6bce9c1d580efdfff148e922a6519db08 (patch) | |
| tree | dc63365c38bf036c1380f7e05b1cbfcb6e0c34bb | |
| parent | 72f7ac9ad66b886f4ea9569446e20aa4f97890e4 (diff) | |
| download | haskell-3c0372d6bce9c1d580efdfff148e922a6519db08.tar.gz | |
distrib: Fix binary distribution installation
This had silently regressed due to 81860281 and the variable renaming performed
in b55ee979, as noted in #17374.
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | distrib/configure.ac.in | 6 | ||||
| -rw-r--r-- | mk/config.mk.in | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 46e1fdd0f7..f86ce4c8a3 100644 --- a/configure.ac +++ b/configure.ac @@ -987,7 +987,6 @@ AS_IF([test "x$with_system_libffi" = "xyes"], [UseSystemLibFFI="YES"], [UseSystemLibFFI="NO"] ) - AC_SUBST(UseSystemLibFFI) AC_ARG_WITH([ffi-includes], diff --git a/distrib/configure.ac.in b/distrib/configure.ac.in index b5f4412276..aa3470a9b1 100644 --- a/distrib/configure.ac.in +++ b/distrib/configure.ac.in @@ -18,8 +18,8 @@ FP_GMP dnl Various things from the source distribution configure bootstrap_target=@TargetPlatform@ -HaveRTSLinker=@HaveRTSLinker@ -AC_SUBST(HaveRTSLinker) +TargetHasRTSLinker=@TargetHasRTSLinker@ +AC_SUBST(TargetHasRTSLinker) FFIIncludeDir=@FFIIncludeDir@ FFILibDir=@FFILibDir@ @@ -42,10 +42,12 @@ FP_FIND_ROOT CrossCompiling=NO CrossCompilePrefix="" TargetPlatformFull="${target}" +TablesNextToCode="@TablesNextToCode@" AC_SUBST(CrossCompiling) AC_SUBST(CrossCompilePrefix) AC_SUBST(TargetPlatformFull) +AC_SUBST(TablesNextToCode) Unregisterised="@Unregisterised@" AC_SUBST(Unregisterised) diff --git a/mk/config.mk.in b/mk/config.mk.in index 98155f823e..50b8aef610 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -440,7 +440,8 @@ EXECUTABLE_FILE = chmod +x # $(GHC) points to installed version of the compiler. # -# NOTE: Don't override $(GHC) in build.mk, use configure --with-ghc instead +# NOTE: Don't override $(GHC) in build.mk, use +# `./configure GHC=...` instead # (because the version numbers have to be calculated). GHC := @WithGhc@ |