[commit: ghc] master: Fix missing symbols when cross-compiling (#583) (fcc62d1)

[git at git.haskell.org]

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

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

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

commit fcc62d1efad0f216b5469f418f57b81a238804ea
Author: Zhen Zhang <izgzhen at gmail.com>
Date:   Fri Apr 27 18:57:59 2018 +0800

    Fix missing symbols when cross-compiling (#583)


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

fcc62d1efad0f216b5469f418f57b81a238804ea
 src/Settings/Builders/Common.hs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Settings/Builders/Common.hs b/src/Settings/Builders/Common.hs
index 36be143..3b8a413 100644
--- a/src/Settings/Builders/Common.hs
+++ b/src/Settings/Builders/Common.hs
@@ -29,9 +29,7 @@ cIncludeArgs = do
     gmpIncludeDir   <- getSetting GmpIncludeDir
     ffiIncludeDir   <- getSetting FfiIncludeDir
 
-    cross   <- expr crossCompiling
-    compilerOrGhc <- package compiler ||^ package ghc
-    mconcat [ not (cross && compilerOrGhc) ? arg "-Iincludes"
+    mconcat [ arg "-Iincludes"
             , arg $ "-I" ++ root -/- generatedDir
             , arg $ "-I" ++ path
             , pure . map ("-I"++) . filter (/= "") $ [iconvIncludeDir, gmpIncludeDir]