Ticket #1049: tt1049.48933675c.diff

File tt1049.48933675c.diff, 3.8 KB (added by jkeenan, 4 years ago)

Most recent diff of this branch against its branch-point

  • config/gen/makefiles/root.in

    diff --git a/config/gen/makefiles/root.in b/config/gen/makefiles/root.in
    index 45236ee..5dff74e 100644
    a b  
    572572# This is set to MAKE=$make if your $make command doesn't 
    573573# do it for you. 
    574574@make_set_make@ 
    575 MAKE = @make_c@ 
     575MAKE = @make@ 
     576MAKE_C = @make_c@ 
    576577 
    577578# These need to be above lines that define suffix rules to be portable 
    578579# (certainly FreeBSD make doesn't grok the pir.pbc rule otherwise) 
     
    836837 
    837838bootstrap-ops : $(OPS2C) 
    838839        $(OPS2C) --core --quiet 
    839         $(MAKE) . 
     840        $(MAKE_C) . 
    840841 
    841842runtime/parrot/include/parrotlib.pbc: runtime/parrot/library/parrotlib.pir $(PARROT) $(GEN_PASM_INCLUDES) 
    842843        $(PARROT) -o $@ runtime/parrot/library/parrotlib.pir 
     
    12951296#       $(PARROT) -o examples/pasm/hello$(O) examples/pasm/hello.pbc 
    12961297# 
    12971298#examples/pasm/hello$(EXE): examples/pasm/hello$(O) 
    1298 #       $(MAKE) . EXEC=examples/pasm/hello exec 
     1299#       $(MAKE_C) . EXEC=examples/pasm/hello exec 
    12991300examples/pasm/hello$(EXE): examples/pasm/hello.pbc $(PBC_TO_EXE) 
    13001301        $(PBC_TO_EXE) examples/pasm/hello.pbc 
    13011302 
     
    19311932        @echo "Perldoc is required, but not detected." 
    19321933 
    19331934html.dummy : 
    1934         $(MAKE) docs html 
     1935        $(MAKE_C) docs html 
    19351936 
    19361937html-clean : 
    1937         $(MAKE) docs html-clean 
     1938        $(MAKE_C) docs html-clean 
    19381939 
    19391940#IF(has_perldoc):htmlhelp : htmlhelp.dummy 
    19401941#ELSE:htmlhelp : htmlhelp.stub 
     
    19431944        @echo "Perldoc is required, but not detected." 
    19441945 
    19451946htmlhelp.dummy : 
    1946         $(MAKE) docs htmlhelp 
     1947        $(MAKE_C) docs htmlhelp 
    19471948 
    19481949htmlhelp-clean : 
    1949         $(MAKE) docs htmlhelp-clean 
     1950        $(MAKE_C) docs htmlhelp-clean 
    19501951 
    19511952pdf: 
    1952         $(MAKE) docs pdf 
     1953        $(MAKE_C) docs pdf 
    19531954 
    19541955pdf-clean: 
    1955         $(MAKE) docs pdf-clean 
     1956        $(MAKE_C) docs pdf-clean 
    19561957 
    19571958############################################################################### 
    19581959# 
     
    19701971############################################################################### 
    19711972 
    19721973editor-clean : 
    1973         $(MAKE) editor clean 
     1974        $(MAKE_C) editor clean 
    19741975 
    19751976############################################################################### 
    19761977# 
  • config/inter/make.pm

    diff --git a/config/inter/make.pm b/config/inter/make.pm
    index 2d315b9..996bd86 100644
    a b  
    112112sub _set_make_c { 
    113113    my ($conf, $prog) = @_; 
    114114    if ( $conf->data->get('gmake_version') ) { 
    115         $conf->data->set( make_c => "$prog -C" ); 
     115        $conf->data->set( make_c => "+$prog -C" ); 
    116116    } 
    117117    else { 
    118  
    119         # get the default value 
    120         my $make_c = $conf->data->get('make_c'); 
    121  
    122         # TT #1049: this is an ugly hack 
    123         # replace the value for $(MAKE) with the actual path or we'll end up 
    124         # with a variable that recursively refers to itself 
    125         $make_c =~ s/\$\(MAKE\)/$prog/; 
    126  
    127         $conf->data->set( make_c => $make_c ); 
     118        # The default value is fine. 
    128119    } 
    129120} 
    130121 
  • t/steps/inter/make-01.t

    diff --git a/t/steps/inter/make-01.t b/t/steps/inter/make-01.t
    index 63a3af7..6912904 100644
    a b  
    6666$conf->data->set('gmake_version' => '4.1'); 
    6767my $prog = 'gmake'; 
    6868inter::make::_set_make_c($conf, $prog); 
    69 is($conf->data->get('make_c'), 'gmake -C', 
     69is($conf->data->get('make_c'), '+gmake -C', 
    7070    "make_c correctly set when gmake"); 
    7171 
    7272$conf->data->set('gmake_version' => undef); 
    73 my $str = q|$(PERL) -e 'chdir shift @ARGV; system q{$(MAKE)}, @ARGV; exit $$?  >> 8;'|; 
     73my $str = q|$(PERL) -e 'chdir shift @ARGV; system q{make}, @ARGV; exit $$?  >> 8;'|; 
    7474$conf->data->set(make_c => $str); 
    7575$prog = 'make'; 
    7676inter::make::_set_make_c($conf, $prog);