summaryrefslogtreecommitdiff
path: root/driver/gcc
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2010-02-18 17:09:31 +0000
committerIan Lynagh <igloo@earth.li>2010-02-18 17:09:31 +0000
commitdc5b9bd64d1c1f544e4813dc946b5a83ad304cee (patch)
treeecae937f9a32cc501648fb1bd5513b42f37138aa /driver/gcc
parentf3e080507db6130c983fc86485661e0f14fba565 (diff)
downloadhaskell-dc5b9bd64d1c1f544e4813dc946b5a83ad304cee.tar.gz
Refactor gcc.c, pulling out the reusable code
Diffstat (limited to 'driver/gcc')
-rw-r--r--driver/gcc/gcc.c89
1 files changed, 8 insertions, 81 deletions
diff --git a/driver/gcc/gcc.c b/driver/gcc/gcc.c
index c086f748e5..4efd559b68 100644
--- a/driver/gcc/gcc.c
+++ b/driver/gcc/gcc.c
@@ -5,6 +5,7 @@
therefore need to add various -B flags to the gcc commandline,
so that it uses our in-tree mingw. Hence this wrapper. */
+#include "cwrapper.h"
#include "getLocation.h"
#include <errno.h>
#include <process.h>
@@ -13,74 +14,10 @@
#include <stdarg.h>
#include <string.h>
-static void die(const char *fmt, ...) {
- va_list argp;
-
- va_start(argp, fmt);
- vfprintf(stderr, fmt, argp);
- va_end(argp);
- exit(1);
-}
-
-static char *mkString(const char *fmt, ...) {
- char *p;
- int i, j;
- va_list argp;
-
- va_start(argp, fmt);
- i = vsnprintf(NULL, 0, fmt, argp);
- va_end(argp);
-
- if (i < 0) {
- die("snprintf 0 failed: errno %d: %s\n", errno, strerror(errno));
- }
-
- p = malloc(i + 1);
- if (p == NULL) {
- die("malloc failed: errno %d: %s\n", errno, strerror(errno));
- }
-
- va_start(argp, fmt);
- j = vsnprintf(p, i + 1, fmt, argp);
- va_end(argp);
- if (i < 0) {
- die("snprintf with %d failed: errno %d: %s\n",
- i + 1, errno, strerror(errno));
- }
-
- 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: errno %d: %s\n", errno, strerror(errno));
- }
- 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;
+ char *preArgv[4];
binDir = getExecutablePath();
exePath = mkString("%s/realgcc.exe", binDir);
@@ -88,21 +25,11 @@ int main(int argc, char** argv) {
/* 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. */
+ preArgv[0] = mkString("-B%s", binDir);
+ preArgv[1] = mkString("-B%s/../lib", binDir);
+ preArgv[2] = mkString("-B%s/../lib/gcc/mingw32/3.4.5", binDir);
+ preArgv[3] = mkString("-B%s/../libexec/gcc/mingw32/3.4.5", binDir);
- 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("spawnv failed: errno %d: %s\n", errno, strerror(errno));
- }
- exit(ret);
+ run(exePath, 4, preArgv, argc - 1, argv + 1);
}
+