[commit: ghc] ghc-7.8: Fix installation of ghc-split (#8760) (97d3abe)

git at git.haskell.org git at git.haskell.org
Thu Feb 20 14:47:19 UTC 2014


Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-7.8
Link       : http://ghc.haskell.org/trac/ghc/changeset/97d3abef9ad929ed1c5921aaf7009b2a86293215/ghc

>---------------------------------------------------------------

commit 97d3abef9ad929ed1c5921aaf7009b2a86293215
Author: Austin Seipp <aseipp at pobox.com>
Date:   Thu Feb 20 07:15:32 2014 -0600

    Fix installation of ghc-split (#8760)
    
    The rules weren't correctly setting INSTALL_TOPDIRS, and on top of that
    the dependencies were wrong when BINDIST=YES.
    
    Authored-by: Evan Hauck <khyperia at live.com>
    Authored-by: Austin Seipp <austin at well-typed.com>
    Signed-off-by: Austin Seipp <austin at well-typed.com>
    
    (cherry picked from commit beac5252d444bafb0722bc6d13c6dd2d49a12070)


>---------------------------------------------------------------

97d3abef9ad929ed1c5921aaf7009b2a86293215
 rules/build-perl.mk |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/rules/build-perl.mk b/rules/build-perl.mk
index 994c765..3f7a026 100644
--- a/rules/build-perl.mk
+++ b/rules/build-perl.mk
@@ -56,7 +56,6 @@ ifeq "$(findstring clean,$(MAKECMDGOALS))" ""
 ifneq "$$(BINDIST)" "YES"
 $1/$2/$$($1_$2_PROG).prl: $1/$$($1_PERL_SRC) $$$$(unlit_INPLACE) | $$$$(dir $$$$@)/.
 	"$$(unlit_INPLACE)" $$(UNLIT_OPTS) $$< $$@
-endif
 
 $1/$2/$$($1_$2_PROG): $1/$2/$$($1_$2_PROG).prl
 	$$(call removeFiles,$$@)
@@ -70,6 +69,15 @@ $$($1_$2_INPLACE): $1/$2/$$($1_$2_PROG) | $$$$(dir $$$$@)/.
 	$$(EXECUTABLE_FILE) $$@
 
 endif
+endif
+
+ifeq "$$($1_$2_INSTALL)" "YES"
+ifeq "$$($1_$2_TOPDIR)" "YES"
+INSTALL_TOPDIRS  += $$($1_$2_INPLACE)
+else
+INSTALL_BINS     += $$($1_$2_INPLACE)
+endif
+endif
 
 $(call profEnd, build-perl($1,$2))
 endef



More information about the ghc-commits mailing list