Ticket #12218: patch-macports-tracemode-disable-filter.diff

File patch-macports-tracemode-disable-filter.diff, 1.5 KB (added by raimue (Rainer Müller), 17 years ago)
  • port1.0/portconfigure.tcl

     
    299299            system "cd ${worksrcpath} && make Makefiles"
    300300        }
    301301    } elseif {[tbool use_configure]} {
     302        global ports_trace
     303
    302304        # Merge (ld|c|cpp|cxx)flags into the environment variable.
    303305        parse_environment configure
    304306
    305307        # Set pre-compiler filter to use (ccache/distcc), if any.
    306         if {[tbool configure.ccache] && [tbool configure.distcc]} {
    307             set filter "ccache "
    308             append_list_to_environment_value configure "CCACHE_PREFIX" "distcc"
    309         } elseif {[tbool configure.ccache]} {
    310             set filter "ccache "
    311         } elseif {[tbool configure.distcc]} {
    312             set filter "distcc "
    313         } else {
    314             set filter ""
     308        # Do not enable any filter in trace mode
     309        set filter ""
     310        if {![info exists ports_trace] || $ports_trace != "yes"} {
     311            if {[tbool configure.ccache] && [tbool configure.distcc]} {
     312                set filter "ccache "
     313                append_list_to_environment_value configure "CCACHE_PREFIX" "distcc"
     314            } elseif {[tbool configure.ccache]} {
     315                set filter "ccache "
     316            } elseif {[tbool configure.distcc]} {
     317                set filter "distcc "
     318            }
    315319        }
    316320       
    317321        # Set flags controlling the kind of compiler output.