ruby-changes:45649
From: nobu <ko1@a...>
Date: Mon, 27 Feb 2017 14:14:36 +0900 (JST)
Subject: [ruby-changes:45649] nobu:r57722 (trunk): Makefile.in: verify-static-library
nobu 2017-02-27 14:14:30 +0900 (Mon, 27 Feb 2017) New Revision: 57722 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=57722 Log: Makefile.in: verify-static-library * Makefile.in (verify-static-library): separate from LIBRUBY_A. no check every times by default. * lib/mkmf.rb (try_link): remove debugging symbol directory after linking, instead of try_do. * lib/mkmf.rb (try_link): bccwin32 support has been removed long ago. Modified files: trunk/Makefile.in trunk/lib/mkmf.rb Index: lib/mkmf.rb =================================================================== --- lib/mkmf.rb (revision 57721) +++ lib/mkmf.rb (revision 57722) @@ -464,7 +464,6 @@ MSG https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L464 xsystem(command, *opts) ensure log_src(src) - MakeMakefile.rm_rf "#{CONFTEST}.dSYM" end end @@ -556,7 +555,8 @@ MSG https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L555 def try_link(src, opt="", *opts, &b) try_link0(src, opt, *opts, &b) ensure - MakeMakefile.rm_f "#{CONFTEST}*", "c0x32*" + MakeMakefile.rm_f "#{CONFTEST}*" + MakeMakefile.rm_rf "#{CONFTEST}.dSYM" end # Returns whether or not the +src+ can be compiled as a C source. +opt+ is Index: Makefile.in =================================================================== --- Makefile.in (revision 57721) +++ Makefile.in (revision 57722) @@ -234,9 +234,11 @@ $(LIBRUBY_A): https://github.com/ruby/ruby/blob/trunk/Makefile.in#L234 $(ECHO) linking static-library $@ $(Q) $(AR) $(ARFLAGS) $@ $(LIBRUBY_A_OBJS) $(INITOBJS) @-$(RANLIB) $@ 2> /dev/null || true + +verify-static-library: $(LIBRUBY_A) $(ECHO) verifying static-library $@ @$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)conftest$(EXEEXT) - @$(RM) conftest$(EXEEXT) conftest.c + @$(RMALL) conftest$(EXEEXT) conftest.c conftest.dSYM $(LIBRUBY_SO): @-$(PRE_LIBRUBY_UPDATE) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/