Commit 29c79451 authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Move the PACKAGE_MAGIC evaluation inside package-data.mk

parent db0c34cd
......@@ -125,10 +125,6 @@ endif
ifeq "$$(phase_$$($1_$2_CONFIGURE_PHASE)_done)" "YES"
# Sometimes we need to modify the automatically-generated package-data.mk
# bindings in a special way for the GHC build system, so allow that here:
$($1_PACKAGE_MAGIC)
# Bootstrapping libs are only built one way
ifeq "$3" "0"
$1_$2_WAYS = v
......
......@@ -376,7 +376,12 @@ generate config_args distdir directory
variablePrefix ++ "_DEP_LIB_DIRS = " ++ unwords (wrap $ forDeps Installed.libraryDirs),
variablePrefix ++ "_DEP_EXTRA_LIBS = " ++ unwords (forDeps Installed.extraLibraries),
variablePrefix ++ "_DEP_LD_OPTS = " ++ unwords (forDeps Installed.ldOptions),
variablePrefix ++ "_BUILD_GHCI_LIB = " ++ boolToYesNo (withGHCiLib lbi)]
variablePrefix ++ "_BUILD_GHCI_LIB = " ++ boolToYesNo (withGHCiLib lbi),
"",
-- Sometimes we need to modify the automatically-generated package-data.mk
-- bindings in a special way for the GHC build system, so allow that here:
"$(eval $(" ++ directory ++ "_PACKAGE_MAGIC))",
]
writeFile (distdir ++ "/package-data.mk") $ unlines xs
writeFile (distdir ++ "/haddock-prologue.txt") $
if null (description pd) then synopsis pd
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment