This goes with the patch for #1839, #1463

[ghc-hetmet.git] / compiler / ghc-inplace.c

diff --git a/compiler/ghc-inplace.c b/compiler/ghc-inplace.c
index abedefe..8cddc89 100644 (file)
--- a/compiler/ghc-inplace.c
+++ b/compiler/ghc-inplace.c
@@ -1,21 +1,29 @@
-
 #include <stdio.h>
+#include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <shell-tools.c>
 
 int main(int argc, char **argv) {
     char **args;
-    args = malloc(sizeof(char *) * (argc + 3));
+    args = malloc(sizeof(char *) * (argc + 4));
     if (args == NULL) {
         fprintf(stderr, "Malloc failed\n");
         exit(1);
     }
-    args[0] = GHC_PATH;
-    args[1] = "-B" TOP_ABS;
-    args[2] = "-fhardwire-lib-paths";
-    memcpy(args + 3, argv + 1, sizeof(char *) * (argc - 1));
-    args[argc+2] = NULL;
-    execv(GHC_PATH, args);
-    return 0;
+    args[0] = "GHC_PATH"; /* Gets replaced by sed */
+    args[1] = "-BTOP_ABS"; /* Gets replaced by sed */
+    args[2] = "-dynload";
+    args[3] = "wrapped";
+    if ((argc >= 2) && (strcmp(argv[1], "-v") == 0)) {
+        printf("Using %s %s %s %s\n", args[0], args[1], args[2], args[3]);
+        fflush(stdout);
+    }
+    memcpy(args + 4, argv + 1, sizeof(char *) * (argc - 1));
+    args[argc+3] = NULL;
+    return run(argv[0],
+               "GHC_PATH", /* Gets replaced by sed */
+               argc + 3,
+               args);
 }