Skip to content
Snippets Groups Projects
Commit 08c9a014 authored by Matthew Pickering's avatar Matthew Pickering Committed by Marge Bot
Browse files

ghc-toolchain: If MergeObjsCmd is not set, replace setting with Nothing

If the user explicitly chooses to not set a MergeObjsCmd then it is
correct to use Nothing for tgtMergeObjs field in the Target file.
parent 3500bb2c
No related branches found
No related tags found
No related merge requests found
......@@ -34,6 +34,6 @@ Target
, tgtRanlib = Just (Ranlib {ranlibProgram = Program {prgPath = "@RanlibCmd@", prgFlags = []}})
, tgtNm = Nm {nmProgram = Program {prgPath = "@NmCmd@", prgFlags = []}}
, tgtMergeObjs = Just (MergeObjs {mergeObjsProgram = Program {prgPath = "@MergeObjsCmd@", prgFlags = @MergeObjsArgsList@}, mergeObjsSupportsResponseFiles = @MergeObjsSupportsResponseFilesBool@})
, tgtMergeObjs = @MergeObjsCmdMaybe@
, tgtWindres = @WindresCmdMaybeProg@
}
......@@ -160,6 +160,14 @@ AC_DEFUN([PREP_TARGET_FILE],[
PREP_LIST([CONF_CXX_OPTS_STAGE0])
PREP_LIST([CONF_GCC_LINKER_OPTS_STAGE0])
if test -z "$MergeObjsCmd"; then
MergeObjsCmdMaybe=Nothing
else
MergeObjsCmdMaybe="Just (MergeObjs {mergeObjsProgram = Program {prgPath = \"$MergeObjsCmd\", prgFlags = $MergeObjsArgsList}, mergeObjsSupportsResponseFiles = $MergeObjsSupportsResponseFilesBool})"
fi
AC_SUBST([MergeObjsCmdMaybe])
dnl PREP_ENDIANNESS
case "$TargetWordBigEndian" in
YES)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment