aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-06-04 03:46:06 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-06-04 03:46:06 +0000
commit75b1b671bf04ad63060aec6a624f448e59c15bda (patch)
tree61d5780d57bb3025c1da0b0a877bdd7c7dbff549
parent36ddebdc6ff9770e1452d4051121d123baacaaa9 (diff)
downloadruby-75b1b671bf04ad63060aec6a624f448e59c15bda.tar.gz
gmake.mk: des_tables.c condition
* defs/gmake.mk (missing/des_tables.c): fix cross compiling condition. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55275 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--defs/gmake.mk7
1 files changed, 4 insertions, 3 deletions
diff --git a/defs/gmake.mk b/defs/gmake.mk
index ba68dc19b9..1bba1faa97 100644
--- a/defs/gmake.mk
+++ b/defs/gmake.mk
@@ -79,13 +79,14 @@ yes-test-all no-test-all: install
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