Wrap gcc on Windows, to provide the -B flags

diff --git a/configure.ac b/configure.ac
index 2ca1735..8d41ac7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -407,7 +407,9 @@ then
         tar -zxf ../../ghc-tarballs/mingw/mingw-runtime*.tar.gz
         tar -jxf ../../ghc-tarballs/mingw/perl*.tar.bz2
         tar -zxf ../../ghc-tarballs/mingw/w32api*.tar.gz
+        mv bin/gcc.exe bin/realgcc.exe
         cd ../..
+        inplace/mingw/bin/realgcc.exe driver/gcc/gcc.c driver/utils/getLocation.c -Idriver/utils -o inplace/mingw/bin/gcc.exe
         AC_MSG_NOTICE([In-tree mingw tree created])
     fi
 fi

diff --git a/driver/gcc/gcc.c b/driver/gcc/gcc.c
new file mode 100644 (file)
index 0000000..cd8a511
--- /dev/null
+++ b/driver/gcc/gcc.c
@@ -0,0 +1,95 @@
+
+#include "getLocation.h"
+#include <process.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+
+static void die(char *msg) {
+    fprintf(stderr, "%s", msg);
+    exit(1);
+}
+
+static char *mkString(const char *fmt, ...) {
+    char *p;
+    int i, j;
+    va_list argp;
+
+    va_start(argp, fmt);
+    i = vsnprintf(p, 0, fmt, argp);
+    va_end(argp);
+
+    if (i < 0) {
+        die("snprintf failed\n");
+    }
+
+    p = malloc(i + 1);
+    if (p == NULL) {
+        die("malloc failed\n");
+    }
+
+    va_start(argp, fmt);
+    j = vsnprintf(p, i + 1, fmt, argp);
+    va_end(argp);
+    if (i < 0) {
+        die("snprintf failed\n");
+    }
+
+    return p;
+}
+
+char *quote(char *str) {
+    char *quotedStr;
+    char *p;
+    int i;
+
+    quotedStr = malloc(2 * strlen(str) + 2 + 1);
+    if (quotedStr == NULL) {
+        die("malloc failed\n");
+    }
+    p = quotedStr;
+    *p++ = '"';
+    while (*str) {
+        if (*str == '"') {
+            *p++ = '\\';
+        }
+        *p++ = *str++;
+    }
+    *p++ = '"';
+    *p = '\0';
+
+    return quotedStr;
+}
+
+int main(int argc, char** argv) {
+    char *p;
+    char *binDir;
+    char *exePath;
+    char *bArg;
+    char **newArgv;
+    int i, j, ret;
+
+    binDir = getExecutablePath();
+    exePath = mkString("%s/realgcc.exe", binDir);
+
+    /* Without these -B args, gcc will still work. However, if you
+       have a mingw installation in c:/mingw then it will use files
+       from that in preference to the in-tree files. */
+
+    newArgv = malloc(sizeof(char *) * (argc + 4 + 1));
+    newArgv[0] = quote(exePath);
+    newArgv[1] = quote(mkString("-B%s", binDir));
+    newArgv[2] = quote(mkString("-B%s/../lib", binDir));
+    newArgv[3] = quote(mkString("-B%s/../lib/gcc/mingw32/3.4.5", binDir));
+    newArgv[4] = quote(mkString("-B%s/../libexec/gcc/mingw32/3.4.5", binDir));
+    for (i = 1; i < argc; i++) {
+        newArgv[4 + i] = quote(argv[i]);
+    }
+    newArgv[4 + argc] = NULL;
+    // execv(exePath, argv);
+    ret = spawnv(_P_WAIT, exePath, (const char* const*)newArgv);
+    if (errno) {
+        die("Spawn failed\n");
+    }
+    exit(ret);
+}

diff --git a/driver/utils/getLocation.c b/driver/utils/getLocation.c
new file mode 100644 (file)
index 0000000..fcbe1b9
--- /dev/null
+++ b/driver/utils/getLocation.c
@@ -0,0 +1,40 @@
+
+#include "getLocation.h"
+#include <stdio.h>
+#include <windows.h>
+
+static void die(char *msg) {
+    fprintf(stderr, "%s", msg);
+    exit(1);
+}
+
+char *getExecutable(void) {
+    char *p;
+    int i;
+    int r;
+
+    i = 2048; /* plenty, PATH_MAX is 512 under Win32 */
+    p = malloc(i);
+    if (p == NULL) {
+        die("Malloc failed\n");
+    }
+    r = GetModuleFileNameA(NULL, p, i);
+    if (r == 0) {
+        die("getModuleFileName failed\n");
+    }
+    return p;
+}
+
+char *getExecutablePath(void) {
+    char *p;
+    char *f;
+
+    p = getExecutable();
+    f = strrchr(p, '\\');
+    if (f == NULL) {
+        die("No '\\' in executable location\n");
+    }
+    f[0] = '\0';
+    return p;
+}
+

diff --git a/driver/utils/getLocation.h b/driver/utils/getLocation.h
new file mode 100644 (file)
index 0000000..689a442
--- /dev/null
+++ b/driver/utils/getLocation.h
@@ -0,0 +1,4 @@
+
+char *getExecutable(void);
+char *getExecutablePath(void);
+