[commit: ghc] master: Update Windows GCC driver. (1e5b7d7)

git at git.haskell.org git at git.haskell.org
Thu Dec 8 23:45:18 UTC 2016


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

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

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

commit 1e5b7d701149dc20c9f92e722c32912c86d53081
Author: Tamar Christina <tamar at zhox.com>
Date:   Thu Dec 8 16:33:11 2016 -0500

    Update Windows GCC driver.
    
    Test Plan: None really, as none of our tests cover this usage. Probably
    should add one..
    
    Reviewers: austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie, #ghc_windows_task_force
    
    Differential Revision: https://phabricator.haskell.org/D2810
    
    GHC Trac Issues: #12871


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

1e5b7d701149dc20c9f92e722c32912c86d53081
 driver/gcc/gcc.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/driver/gcc/gcc.c b/driver/gcc/gcc.c
index 517b008..e66accb 100644
--- a/driver/gcc/gcc.c
+++ b/driver/gcc/gcc.c
@@ -48,11 +48,11 @@ int main(int argc, char** argv) {
     preArgv[0] = mkString("-B%s", binDir);
     preArgv[1] = mkString("-B%s/../lib", binDir);
 #ifdef __MINGW64__
-    preArgv[2] = mkString("-B%s/../lib/gcc/x86_64-w64-mingw32/5.2.0", binDir);
-    preArgv[3] = mkString("-B%s/../libexec/gcc/x86_64-w64-mingw32/5.2.0", binDir);
+    preArgv[2] = mkString("-B%s/../lib/gcc/x86_64-w64-mingw32/6.2.0", binDir);
+    preArgv[3] = mkString("-B%s/../libexec/gcc/x86_64-w64-mingw32/6.2.0", binDir);
 #else
-    preArgv[2] = mkString("-B%s/../lib/gcc/i686-w64-mingw32/5.2.0", binDir);
-    preArgv[3] = mkString("-B%s/../libexec/gcc/i686-w64-mingw32/5.2.0", binDir);
+    preArgv[2] = mkString("-B%s/../lib/gcc/i686-w64-mingw32/6.2.0", binDir);
+    preArgv[3] = mkString("-B%s/../libexec/gcc/i686-w64-mingw32/6.2.0", binDir);
 #endif
     run(exePath, 4, preArgv, argc - 1, argv + 1);
 }



More information about the ghc-commits mailing list