[commit: ghc] master: Fix make binary-dist on OS X (#8122) (50055af)

git at git.haskell.org git at git.haskell.org
Fri Nov 22 14:22:44 UTC 2013


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/50055afe0dea0bcea8eea8d53353dfd0f1f204ca/ghc

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

commit 50055afe0dea0bcea8eea8d53353dfd0f1f204ca
Author: Austin Seipp <austin at well-typed.com>
Date:   Tue Nov 12 16:43:50 2013 -0600

    Fix make binary-dist on OS X (#8122)
    
    Authored-by: Christiaan Baaj <christiaan.baaij at gmail.com>
    Signed-off-by: Austin Seipp <austin at well-typed.com>


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

50055afe0dea0bcea8eea8d53353dfd0f1f204ca
 rules/build-prog.mk |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/rules/build-prog.mk b/rules/build-prog.mk
index 54424cf..5837bb0 100644
--- a/rules/build-prog.mk
+++ b/rules/build-prog.mk
@@ -285,12 +285,6 @@ $1/$2/build/tmp/$$($1_$2_PROG) : $$(ALL_STAGE1_LIBS) $$(ALL_RTS_LIBS) $$(OTHER_L
 endif
 endif
 endif
-endif
-
-ifneq "$$($1_$2_INSTALL_INPLACE)" "NO"
-$(call all-target,$1_$2,$$($1_$2_INPLACE))
-endif
-$(call clean-target,$1,$2_inplace,$$($1_$2_INPLACE))
 
 # INPLACE_BIN might be empty if we're distcleaning
 ifeq "$(findstring clean,$(MAKECMDGOALS))" ""
@@ -300,6 +294,13 @@ $$($1_$2_INPLACE) : $1/$2/build/tmp/$$($1_$2_PROG_INPLACE) | $$$$(dir $$$$@)/.
 endif
 endif
 
+endif
+
+ifneq "$$($1_$2_INSTALL_INPLACE)" "NO"
+$(call all-target,$1_$2,$$($1_$2_INPLACE))
+endif
+$(call clean-target,$1,$2_inplace,$$($1_$2_INPLACE))
+
 ifeq "$$($1_$2_INSTALL)" "YES"
 ifeq "$$($1_$2_PROG_NEEDS_C_WRAPPER)" "YES"
 INSTALL_LIBS     += $1/$2/build/tmp/$$($1_$2_PROG).dll



More information about the ghc-commits mailing list