Cross build broken in commit 7af29da0

I have been buildng a x86_64/linux to armhf/linux cross-compiler using:

./configure --target=arm-linux-gnueabihf -with-gcc=arm-linux-gnueabihf-gcc-5
make -j3

for some time.

However, after commit 7af29da0, that results in:

"inplace/bin/ghc-cabal" check libraries/base
"inplace/bin/ghc-cabal" configure libraries/base dist-install ""
  --with-ghc="/md-new/home/erikd/Git/ghc-upstream/inplace/bin/ghc-stage1"
  --with-ghc-pkg="/md-new/home/erikd/Git/ghc-upstream/inplace/bin/ghc-pkg"
  --flags=integer-simple --disable-library-for-ghci 
  --enable-library-vanilla --enable-library-for-ghci 
  --disable-library-profiling --disable-shared 
  --configure-option=CFLAGS="-Wall -marm -fno-stack-protector    
  -Werror=unused-but-set-variable -Wno-error=inline"
  --configure-option=LDFLAGS="  " --configure-option=CPPFLAGS="   "
  --gcc-options="-Wall -marm -fno-stack-protector
  -Werror=unused-but-set-variable -Wno-error=inline   "
  --configure-option=--host=arm-unknown-linux-gnueabihf
  --with-gcc="arm-linux-gnueabihf-gcc-5"
  --with-ld="/usr/bin/arm-linux-gnueabihf-ld.gold"
  --configure-option=--with-cc="arm-linux-gnueabihf-gcc-5"
  --with-ar="/usr/bin/arm-linux-gnueabihf-ar"
  --with-alex="/usr/bin/alex" --with-happy="/usr/bin/happy"
Configuring base-4.9.0.0...
configure: WARNING: unrecognized options: --with-compiler, --with-gcc
checking for arm-unknown-linux-gnueabihf-gcc... no
checking for gcc... gcc
checking whether the C compiler works... no
configure: error: in `/md-new/home/erikd/Git/ghc-upstream/libraries/base':
configure: error: C compiler cannot create executables
See `config.log' for more details
libraries/base/ghc.mk:4: recipe for target
  'libraries/base/dist-install/package-data.mk' failed
make[1]: *** [libraries/base/dist-install/package-data.mk] Error 77
Makefile:121: recipe for target 'all' failed

It seems that the required GCC version doesn't get passed to configuration for Base.

Trac metadata

Trac field	Value
Version	7.11
Type	Bug
TypeOfFailure	OtherFailure
Priority	normal
Resolution	Unresolved
Component	Build System
Test case
Differential revisions
BlockedBy
Related
Blocking
CC	hvr
Operating system
Architecture