Commit a214945e authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Fix installing the ghc package .hi files in a bindist

parent 12cc5a0f
...@@ -864,8 +864,14 @@ GhcLibWays = $(GhcCompilerWays) ...@@ -864,8 +864,14 @@ GhcLibWays = $(GhcCompilerWays)
# override $(GhcLibHcOpts): we want GhcStage2HcOpts to take precedence # override $(GhcLibHcOpts): we want GhcStage2HcOpts to take precedence
GhcLibHcOpts = GhcLibHcOpts =
ifeq "$(DOING_BIN_DIST)" "YES"
# This is derived from the sources when we are in a source tree, but we
# don't have any sources in a bindist, so we have to shortcut it
HS_IFACES := $(wildcard stage$(stage)/*/*.hi)
else
# override default definition of HS_IFACES so we can add $(odir) # override default definition of HS_IFACES so we can add $(odir)
HS_IFACES = $(addsuffix .$(way_)hi,$(basename $(HS_OBJS))) HS_IFACES = $(addsuffix .$(way_)hi,$(basename $(HS_OBJS)))
endif
# Haddock can't handle recursive modules currently, so we disable it for now. # Haddock can't handle recursive modules currently, so we disable it for now.
override HADDOCK_DOCS = NO override HADDOCK_DOCS = NO
...@@ -940,12 +946,6 @@ endif ...@@ -940,12 +946,6 @@ endif
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# binary-dist # binary-dist
ifeq "$(DOING_BIN_DIST)" "YES"
# This is derived from the sources when we are in a source tree, but we
# don't have any sources in a bindist, so we have to shortcut it
HS_IFACES := $(wildcard stage$(stage)/*/*.hi)
endif
binary-dist: binary-dist:
$(INSTALL_DIR) $(BIN_DIST_DIR)/compiler $(INSTALL_DIR) $(BIN_DIST_DIR)/compiler
$(INSTALL_DIR) $(BIN_DIST_DIR)/compiler/stage$(stage) $(INSTALL_DIR) $(BIN_DIST_DIR)/compiler/stage$(stage)
......
Supports Markdown
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