X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FHpc.c;h=a6e854ba830f0ec02c6759eb93abe5b1ebd4556d;hb=de75026f5a48d3d052135a973ab4dff76c5b20f5;hp=3c725f48e7b6cfa5e0b9606411ad1f9b9581e4bc;hpb=cc52f604e67ad4b45ce449e7b957379f7a85855f;p=ghc-hetmet.git

diff --git a/rts/Hpc.c b/rts/Hpc.c
index 3c725f4..a6e854b 100644
--- a/rts/Hpc.c
+++ b/rts/Hpc.c
@@ -174,17 +174,28 @@ readTix(void) {
 
 static void hpc_init(void) {
   char *hpc_tixdir;
+  char *hpc_tixfile;
   if (hpc_inited != 0) {
     return;
   }
   hpc_inited = 1;
   hpc_pid    = getpid();
   hpc_tixdir = getenv("HPCTIXDIR");
-
-  if (hpc_tixdir != NULL) {
-    /* Make sure the directory is present
+  hpc_tixfile = getenv("HPCTIXFILE");
+
+  /* XXX Check results of mallocs/strdups, and check we are requesting
+         enough bytes */
+  if (hpc_tixfile != NULL) {
+    tixFilename = strdup(hpc_tixfile);
+  } else if (hpc_tixdir != NULL) {
+    /* Make sure the directory is present;
+     * conditional code for mkdir lifted from lndir.c
      */
+#ifdef WIN32
+    mkdir(hpc_tixdir);
+#else
     mkdir(hpc_tixdir,0777);
+#endif
     /* Then, try open the file
      */
     tixFilename = (char *) malloc(strlen(hpc_tixdir) + strlen(prog_name) + 12);