[project @ 2004-09-01 13:14:12 by simonmar]

Better fix for previous from Ian Lynagh.

diff --git a/ghc/driver/split/ghc-split.lprl b/ghc/driver/split/ghc-split.lprl
index 58c603f..880ca9c 100644 (file)
--- a/ghc/driver/split/ghc-split.lprl
+++ b/ghc/driver/split/ghc-split.lprl
@@ -45,13 +45,9 @@ sub split_asm_file {
 #   &tidy_up_and_die(1,"$Pgm: no split markers in .s file!\n")
 #      if $prologue_stuff eq $s_stuff;
 
-    # about to use $Tmp_prefix in a regex - make sure backslashes don't get
-    # interpreted in a strange way.  ToDo: what about other regex
-    # characters, eg. '.'?
-    $Tmp_prefix =~ s/\\/\\\\/g;
-
     # lie about where this stuff came from
-    $prologue_stuff =~ s|"${Tmp_prefix}\.c"|"$ifile_root\.hc"|g;
+    # Note the \Q: this ignores regex meta-chars in $Tmp_prefix.
+    $prologue_stuff =~ s/\Q"$Tmp_prefix.c"/"$ifile_root.hc"/g;
 
     while ( $_ ne '' ) { # not EOF
        $octr++;