Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Alex D
GHC
Commits
3bc03ff9
Commit
3bc03ff9
authored
May 20, 2009
by
Ian Lynagh
Browse files
Fix building ghc-pkg when bootstrapping
parent
7f69b695
Changes
1
Hide whitespace changes
Inline
Side-by-side
utils/ghc-pkg/ghc.mk
View file @
3bc03ff9
...
...
@@ -15,6 +15,21 @@
utils/
ghc-pkg_dist_PROG
=
ghc-pkg
ifeq
"$(BootingFromHc)" "YES"
inplace/bin/ghc-pkg
:
utils/ghc-pkg/dist-install/build/tmp/$(utils/ghc-pkg_dist_PROG)$(exeext)
ifeq
"$(Windows)" "YES"
cp
$<
$@
else
$(RM)
$@
echo
"#!/bin/sh"
>>
$@
echo
"PKGCONF=
$(TOP)
/
$(INPLACE_PACKAGE_CONF)
"
>>
$@
echo
'
$(TOP)
/$< --global-conf $$PKGCONF $${1+"$$@"}'
>>
$@
chmod
+x
$@
endif
else
$(GHC_PKG_INPLACE)
:
utils/ghc-pkg/dist/build/$(utils/ghc-pkg_dist_PROG)$(exeext) $(MKDIRHIER)
$(MKDIRHIER)
$(
dir
$(INPLACE_PACKAGE_CONF)
)
echo
"[]"
>
$(INPLACE_PACKAGE_CONF)
...
...
@@ -28,6 +43,8 @@ else
chmod
+x
$@
endif
endif
# depend on ghc-cabal, otherwise we build Cabal twice when building in parallel
utils/ghc-pkg/dist/build/$(utils/ghc-pkg_dist_PROG)$(exeext)
:
utils/ghc-pkg/Main.hs utils/ghc-pkg/Version.hs $(GHC_CABAL_INPLACE) $(MKDIRHIER)
$(MKDIRHIER)
bootstrapping
...
...
@@ -67,6 +84,10 @@ utils/ghc-pkg_dist-install_INSTALL_SHELL_WRAPPER = YES
utils/
ghc-pkg_dist-install_INSTALL_SHELL_WRAPPER_NAME
=
ghc-pkg-
$(ProjectVersion)
utils/
ghc-pkg_dist-install_INSTALL_INPLACE
=
NO
ifeq
"$(BootingFromHc)" "YES"
utils/
ghc-pkg_dist-install_OTHER_OBJS
+=
$(ALL_STAGE1_LIBS)
$(ALL_STAGE1_LIBS)
$(ALL_STAGE1_LIBS)
$(ALL_RTS_LIBS)
$(libffi_STATIC_LIB)
endif
$(eval
$(call
build-prog,utils/ghc-pkg,dist-install,1))
ifeq
"$(Windows)" "NO"
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment