Skip to content
Snippets Groups Projects
Commit a61f6061 authored by sof's avatar sof
Browse files

[project @ 1997-05-26 06:20:52 by sof]

With -noC, do *not* touch .o file; process interface file only if we're generating one; new opt: -fno-prune-instdecls;renamed -fno-tycon-prunings to -fno-prune-tydecls;
parent 61b361d5
No related branches found
No related tags found
No related merge requests found
...@@ -1835,7 +1835,7 @@ sub runHscAndProcessInterfaces { ...@@ -1835,7 +1835,7 @@ sub runHscAndProcessInterfaces {
# See if it bailed out early, saying nothing needed doing. # See if it bailed out early, saying nothing needed doing.
# We work this out by seeing if it created an output .hi file # We work this out by seeing if it created an output .hi file
if ( ! -f $hsc_hi ) { if ( ! -f $hsc_hi && $ProduceHi !~ /-nohifile=/ ) {
# Doesn't exist, so we bailed out early. # Doesn't exist, so we bailed out early.
# Tell the C compiler and assembler not to run # Tell the C compiler and assembler not to run
$do_cc = 0; $do_as = 0; $do_cc = 0; $do_as = 0;
...@@ -1853,8 +1853,10 @@ sub runHscAndProcessInterfaces { ...@@ -1853,8 +1853,10 @@ sub runHscAndProcessInterfaces {
# out early, we still need to touch the interface file of B. The reason # out early, we still need to touch the interface file of B. The reason
# for this is that B may export A's interface. # for this is that B may export A's interface.
# #
&run_something("touch $ofile_target $hifile_target", &run_something("touch $ofile_target",
"Touch $ofile_target $hifile_target, to propagate dependencies"); "Touch $ofile_target, to propagate dependencies") if $HscOut ne '-N=';
&run_something("touch $hifile_target",
"Touch $hifile_target, to propagate dependencies") if $ProduceHi =~ /-nohifile=/ ;
} else { } else {
...@@ -1879,9 +1881,10 @@ sub runHscAndProcessInterfaces { ...@@ -1879,9 +1881,10 @@ sub runHscAndProcessInterfaces {
# Interface-handling is important enough to live off by itself # Interface-handling is important enough to live off by itself
require('ghc-iface.prl') || &tidy_up_and_die(1,"$Pgm: panic: can't load ghc-iface.prl!\n"); if ( $ProduceHi !~ /-nohifile=/ ) { # If we've produced one, process it.
&postprocessHiFile($hsc_hi, $hifile_target, $going_interactive); require('ghc-iface.prl') || &tidy_up_and_die(1,"$Pgm: panic: can't load ghc-iface.prl!\n");
&postprocessHiFile($hsc_hi, $hifile_target, $going_interactive);
}
# if we're going to split up object files, # if we're going to split up object files,
# we inject split markers into the .hc file now # we inject split markers into the .hc file now
if ( $HscOut eq '-C=' && $SplitObjFiles ) { if ( $HscOut eq '-C=' && $SplitObjFiles ) {
...@@ -2909,8 +2912,8 @@ arg: while($_ = $Args[0]) { ...@@ -2909,8 +2912,8 @@ arg: while($_ = $Args[0]) {
# --------------- Renamer ------------- # --------------- Renamer -------------
/^-fno-tycon-pruning$/ /^-fno-prune-tydecls$/ && do { push(@HsC_flags, $_); next arg; };
&& do { push(@HsC_flags, $_); next arg; }; /^-fno-prune-instdecls$/ && do { push(@HsC_flags, $_); next arg; };
# --------------- # ---------------
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment