Skip to content

Commit

Permalink
Revert "* configure.in (Makefile): get rid of confliction with -j."
Browse files Browse the repository at this point in the history
This reverts commit r35104 because it breaks build on FreeBSD.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35113 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
nurse committed Mar 22, 2012
1 parent 2b84626 commit 4725c98
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -3075,10 +3075,12 @@ AC_CONFIG_FILES(Makefile, [{
else
echo 'distclean-local::; @$(RM) GNUmakefile uncommon.mk'
fi
} > confmk$$.tmp && mv -f confmk$$.tmp Makefile &&
{
grep '^ruby:' Makefile > /dev/null ||
${MAKE-make} info-program | grep '^PROGRAM=ruby$' > /dev/null ||
echo 'ruby: $(PROGRAM);'
} > confmk$$.tmp && mv -f confmk$$.tmp Makefile],
echo 'ruby: $(PROGRAM);' >> Makefile
}],
[EXEEXT='$EXEEXT' gnumake='$gnumake'])

AC_ARG_WITH([ruby-pc],
Expand Down

0 comments on commit 4725c98

Please sign in to comment.