Ticket #698: tt698-simplify-1.patch

File tt698-simplify-1.patch, 1.9 KB (added by doughera, 6 years ago)
  • config/gen/makefiles/dynoplibs.in

    diff -r -u parrot-current/config/gen/makefiles/dynoplibs.in parrot-andy/config/gen/makefiles/dynoplibs.in
    old new  
    1717CFLAGS        := @ccflags@ @cc_shared@ @cc_debug@ @ccwarn@ @cc_hasjit@ @cg_flag@ @gc_flag@ 
    1818CC_OUT        := @cc_o_out@ 
    1919LD_OUT        := @ld_out@ 
    20 #IF(parrot_is_shared):LIBPARROT     := @libparrot_ldflags@ 
    21 #ELSE:LIBPARROT     := 
     20LIBPARROT     := @libparrot_ldflags@ 
    2221 
    2322BUILD_TOOLS_DIR := $(BUILD_DIR)@slash@tools@slash@build 
    2423OPS2C           := $(PERL) -I$(BUILD_DIR)@slash@lib $(BUILD_TOOLS_DIR)@slash@ops2c.pl 
  • config/gen/makefiles/dynpmc.in

    diff -r -u parrot-current/config/gen/makefiles/dynpmc.in parrot-andy/config/gen/makefiles/dynpmc.in
    old new  
    1717CFLAGS        := @ccflags@ @cc_shared@ @cc_debug@ @ccwarn@ @cc_hasjit@ @cg_flag@ @gc_flag@ 
    1818CC_OUT        := @cc_o_out@ 
    1919LD_OUT        := @ld_out@ 
    20 #IF(parrot_is_shared):LIBPARROT     := @libparrot_ldflags@ 
    21 #ELSE:LIBPARROT     := 
     20LIBPARROT     := @libparrot_ldflags@ 
    2221 
    2322BUILD_TOOLS_DIR := $(BUILD_DIR)@slash@tools@slash@build 
    2423BUILD_LIB_DIR   := $(BUILD_DIR)@slash@blib@slash@lib 
    2524PMC2C           := $(PERL) $(BUILD_TOOLS_DIR)@slash@pmc2c.pl 
    2625INCLUDES        := -I$(BUILD_DIR)@slash@include -I@build_dir@@slash@src@slash@pmc 
    27 #IF(!cygwin and cc==gcc):LINKARGS       := -Wl,-L $(BUILD_LIB_DIR) $(LDFLAGS) $(LD_LOAD_FLAGS) $(LIBPARROT) @icu_shared@ @libs@ 
    28 #ELSE:LINKARGS        := $(LDFLAGS) $(LD_LOAD_FLAGS) $(LIBPARROT) @icu_shared@ @libs@ 
     26LINKARGS        := $(LDFLAGS) $(LD_LOAD_FLAGS) $(LIBPARROT) @icu_shared@ @libs@ 
    2927 
    3028PMC2CD := $(PERL) $(BUILD_TOOLS_DIR)/pmc2c.pl --dump 
    3129PMC2CC := $(PERL) $(BUILD_TOOLS_DIR)/pmc2c.pl --c