ruby-changes:43201
From: nobu <ko1@a...>
Date: Sat, 4 Jun 2016 12:46:10 +0900 (JST)
Subject: [ruby-changes:43201] nobu:r55275 (trunk): gmake.mk: des_tables.c condition
nobu 2016-06-04 12:46:06 +0900 (Sat, 04 Jun 2016) New Revision: 55275 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=55275 Log: gmake.mk: des_tables.c condition * defs/gmake.mk (missing/des_tables.c): fix cross compiling condition. Modified files: trunk/defs/gmake.mk Index: defs/gmake.mk =================================================================== --- defs/gmake.mk (revision 55274) +++ defs/gmake.mk (revision 55275) @@ -79,13 +79,14 @@ yes-test-all no-test-all: install https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L79 endif $(srcdir)/missing/des_tables.c: $(srcdir)/missing/crypt.c -ifeq ($(if $(CC),$(CROSS_COMPILING),yes),yes) +ifeq ($(if $(filter yes,$(CROSS_COMPILING)),,$(CC)),) touch $@ else @$(ECHO) building make_des_table - $(Q) $(PURIFY) $(CC) $(CPPFLAGS) -DDUMP $(LDFLAGS) $(XLDFLAGS) $(LIBS) $(OUTFLAG)make_des_table $(srcdir)/missing/crypt.c + $(CC) $(CPPFLAGS) -DDUMP $(LDFLAGS) $(XLDFLAGS) $(LIBS) -omake_des_table $(srcdir)/missing/crypt.c + @[ -x ./make_des_table ] @$(ECHO) generating $@ $(Q) $(MAKEDIRS) $(@D) - $(Q) ./make_des_table > $@ + $(Q) ./make_des_table | $(srcdir)/tool/ifchange $@ - $(Q) $(RMALL) make_des_table* endif -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/