From d6cecde585b0980ed8e0050c5a1d315789fb6356 Mon Sep 17 00:00:00 2001
From: Tamar Christina <tamar@zhox.com>
Date: Sat, 17 Jun 2017 01:05:52 +0100
Subject: Remove the Windows GCC driver.

Summary:
This patch drops the GCC driver and instead moves
the only remaining path that we need to keep for
backwards compatibility to the settings file.

It also generalizes the code that expands `$TopDir`
so it can expand it within any location in the string
and also changes it so `$TopDir` is expanded only
after the words call because `$TopDir` can contains
spaces which would be horribly broken.

Test Plan: ./validate

Reviewers: austin, hvr, bgamari

Reviewed By: bgamari

Subscribers: rwbarton, thomie, erikd

GHC Trac Issues: #13709

Differential Revision: https://phabricator.haskell.org/D3592
---
 configure.ac | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 721f0e7b8b..d7c6ad83f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -302,8 +302,6 @@ fail() {
 if test "$HostOS" = "mingw32"
 then
     # Find the mingw-w64 7z file to extract.
-    # NB. If you update the tarballs to a new version of gcc, don't
-    # forget to tweak the paths in driver/gcc/gcc.c.
     if test "$HostArch" = "i386"
     then
         mingw_arch="i686"
@@ -366,12 +364,6 @@ set_up_tarballs() {
         mv "inplace/${tarball_mingw_dir}" inplace/mingw &&
         touch inplace/mingw
 
-        # NB. Now since the GCC is hardcoded to use /mingw32 we need to
-        # make a wrapper around it to give it the proper paths
-        mv inplace/mingw/bin/gcc.exe inplace/mingw/bin/realgcc.exe
-        PATH=`pwd`/inplace/mingw/bin:$PATH
-        inplace/mingw/bin/realgcc.exe driver/gcc/gcc.c driver/utils/cwrapper.c driver/utils/getLocation.c -Idriver/utils -o inplace/mingw/bin/gcc.exe
-
         AC_MSG_NOTICE([In-tree MingW-w64 tree created])
     fi
 }
-- 
cgit v1.2.1