mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-04 03:50:31 +00:00
correct cygwin detection (issue #5328)
handle parallel make better (issue #5328) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6725 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -3,9 +3,8 @@
|
||||
#
|
||||
|
||||
OSTYPE=$(shell uname -s)
|
||||
cygx="$(shell uname -s | sed -e c\cygwin | tr [:upper:] [:lower:])"
|
||||
define cyg_subst_sys
|
||||
if [ $(cygx) = "cygwin" ]; then \
|
||||
if uname -s | grep -qi cygwin; then \
|
||||
cat $@ | sed -e s/"sys\.h"/"config.h"/g > $@.copy; \
|
||||
mv --force $@.copy $@; \
|
||||
fi
|
||||
@@ -230,3 +229,5 @@ editline.c : $(ACSRCS) $(BCSRCS) $(AGCSRCS)
|
||||
|
||||
.c.o_s : $(AGHDRS) $(BGHDRS)
|
||||
$(CC) -c $(S_CFLAGS) $(CFLAGS) $(CPPFLAGS) $< -o $@
|
||||
|
||||
$(CCSRCS) : $(BGHDRS)
|
||||
|
3
editline/configure
vendored
3
editline/configure
vendored
@@ -895,8 +895,7 @@ case "${host}" in
|
||||
ABI="elf"
|
||||
;;
|
||||
*-*-linux* | *cygwin*)
|
||||
cyg="$(echo ${host} | sed -e c\cygwin)"
|
||||
if [ ${cyg} = cygwin ]; then \
|
||||
if echo ${host} | grep -q cygwin ; then \
|
||||
echo "cygwin detected"; \
|
||||
S_CFLAGS=""; \
|
||||
echo "/* cygdef.h. Generated automatically by configure. */
|
||||
|
@@ -32,8 +32,7 @@ case "${host}" in
|
||||
ABI="elf"
|
||||
;;
|
||||
*-*-linux* | *cygwin*)
|
||||
cyg="$(echo ${host} | sed -e c\cygwin)"
|
||||
if [ ${cyg} = cygwin ]; then \
|
||||
if echo ${host} | grep -q cygwin ; then \
|
||||
echo "cygwin detected"; \
|
||||
S_CFLAGS=""; \
|
||||
echo "/* cygdef.h. Generated automatically by configure. */
|
||||
|
Reference in New Issue
Block a user