[commit: ghc] master: Fix the build when SplitObjs=YES (89223ce)

git at git.haskell.org git at git.haskell.org
Sat Jun 6 17:53:08 UTC 2015


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/89223ce1340654455a9f3aa9cbf25f30884227fd/ghc

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

commit 89223ce1340654455a9f3aa9cbf25f30884227fd
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Sat Jun 6 18:47:05 2015 +0200

    Fix the build when SplitObjs=YES
    
    The default (perf) build, which sets SplitObjs=YES, was broken with
    commit 5dd02864a844bcf6fe0018755ff261affdef3fea.
    
    I accidently removed the wrong `endif`. This should fix it.


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

89223ce1340654455a9f3aa9cbf25f30884227fd
 rules/build-perl.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/build-perl.mk b/rules/build-perl.mk
index 46cf053..b943e16 100644
--- a/rules/build-perl.mk
+++ b/rules/build-perl.mk
@@ -29,6 +29,7 @@ $$(error $1_$2_PROGNAME is not set)
 endif
 ifneq "$$($1_$2_PROG)" ""
 $$(error $1_$2_PROG is set)
+endif
 $1_$2_PROG = $$($1_$2_PROGNAME)
 
 ifneq "$$($$($1_$2_PROG)_INPLACE)" ""
@@ -39,7 +40,6 @@ $$($1_$2_PROG)_INPLACE = $$(INPLACE_TOPDIR)/$$($1_$2_PROG)
 else
 $$($1_$2_PROG)_INPLACE = $$(INPLACE_BIN)/$$($1_$2_PROG)
 endif
-endif
 
 $1_$2_INPLACE = $$($$($1_$2_PROG)_INPLACE)
 



More information about the ghc-commits mailing list