From 0701db125eb32ed0a518d962c9e4ee279e3296fd Mon Sep 17 00:00:00 2001
From: "Edward Z. Yang" <ezyang@cs.stanford.edu>
Date: Mon, 20 Jun 2016 09:02:34 +0200
Subject: Updates to handle new Cabal

Specifically per-component macros and multiple libraries.

Contains Cabal submodule update.

Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>

Test Plan: validate

Reviewers: austin, bgamari

Reviewed By: austin, bgamari

Subscribers: hvr, thomie

Differential Revision: https://phabricator.haskell.org/D2059
---
 rules/hs-sources.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rules/hs-sources.mk')

diff --git a/rules/hs-sources.mk b/rules/hs-sources.mk
index 2e77d02a20..20c286dcbe 100644
--- a/rules/hs-sources.mk
+++ b/rules/hs-sources.mk
@@ -28,7 +28,7 @@ endif
 $1_$2_HS_SRCS := $$(foreach file,$$($1_$2_SLASH_MODS),\
                  $$(firstword \
                    $$(wildcard \
-                     $$(foreach dir,$$($1_$2_HS_SRC_DIRS) $2/build/autogen,\
+                     $$(foreach dir,$$($1_$2_HS_SRC_DIRS) $2/build/$$(or $$($1_EXECUTABLE),$$($1_$2_PROGNAME),.)/autogen,\
                         $1/$$(dir)/$$(file).hs $1/$$(dir)/$$(file).lhs)) \
                    $1/$2/build/$$(file).hs))
 
-- 
cgit v1.2.1