cpp/openttd-patchpack/source Changeset - r23104:12c7cfb8fcee

Changeset - r23104:12c7cfb8fcee

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

Charles Pigott - 6 years ago 2018-09-24 21:17:55
charlespigott@googlemail.com

Fix: [OSX] Check all search paths for iconv.h

1 file changed with 10 insertions and 4 deletions:

config.lib

0 comments (0 inline, 0 general)

config.lib

➞

Show inline comments

@@ @@ -2924,16 +2924,22 @@ detect_iconv() { @@
 		return 0
 	fi
 	# Try to find iconv.h, seems to only thing to detect iconv with
 	if [ "$with_iconv" = "1" ] || [ "$with_iconv" = "" ] || [ "$with_iconv" = "2" ]; then
 		iconv=`ls -1 /usr/include 2>/dev/null | grep "iconv.h"`
 		if [ -z "$iconv" ]; then
 			iconv=`ls -1 /usr/local/include 2>/dev/null | grep "iconv.h"`
 		fi
 		# Iterate over search paths
 		iconv=""
 		search_paths=`LC_ALL=C $cxx_host $OSX_SYSROOT $CFLAGS -E - -v </dev/null 2>&1 | \
 		              $awk '/#include <...> search starts here:/{flag=1;next}/End of search list./{flag=0}flag'`
 		for path in $search_paths; do
 			iconv=`ls -1 $path 2>/dev/null | grep "iconv.h"`
 			if [ -n "$iconv" ]; then
 				break
 			fi
 		done
 	else
 		# Make sure it exists
 		iconv=`ls $with_iconv/include/iconv.h 2>/dev/null`
 	fi
 	if [ -z "$iconv" ]; then

0 comments (0 inline, 0 general)