Commit 2f4fb5b5 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

Merge branch 'dependencies-fixes' of git://git.busybox.net/~tpetazzoni/git/buildroot

parents 2f9784f3 c87eb21e

toolchain/dependencies/dependencies.sh

+19 −4
Original line number Diff line number Diff line
@@ -23,10 +23,10 @@ fi 
# sanity check for CWD in LD_LIBRARY_PATH

# try not to rely on egrep..

if test -n "$LD_LIBRARY_PATH" ; then

	/bin/echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | /bin/grep ':.:' >/dev/null 2>&1 ||

	/bin/echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | /bin/grep 'TRiGGER_start:' >/dev/null 2>&1 ||

	/bin/echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | /bin/grep ':TRiGGER_end' >/dev/null 2>&1 ||

	/bin/echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | /bin/grep '::' >/dev/null 2>&1

	/bin/echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | /bin/grep ':\.:' >/dev/null 2>&1 ||

	/bin/echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | /bin/grep 'TRiGGER_start\.:' >/dev/null 2>&1 ||

	/bin/echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | /bin/grep ':\.TRiGGER_end' >/dev/null 2>&1 ||

	/bin/echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | /bin/grep 'TRiGGER_start\.TRiGGER_end' >/dev/null 2>&1

	if test $? = 0; then

		/bin/echo -e "\nYou seem to have the current working directory in your"

		/bin/echo -e "LD_LIBRARY_PATH environment variable. This doesn't work.\n"
@@ -34,6 +34,21 @@ if test -n "$LD_LIBRARY_PATH" ; then 
	fi

fi;



# sanity check for CWD in PATH. Having the current working directory

# in the PATH makes the toolchain build process break.

# try not to rely on egrep..

if test -n "$PATH" ; then

	/bin/echo TRiGGER_start"$PATH"TRiGGER_end | /bin/grep ':\.:' >/dev/null 2>&1 ||

	/bin/echo TRiGGER_start"$PATH"TRiGGER_end | /bin/grep 'TRiGGER_start\.:' >/dev/null 2>&1 ||

	/bin/echo TRiGGER_start"$PATH"TRiGGER_end | /bin/grep ':\.TRiGGER_end' >/dev/null 2>&1 ||

	/bin/echo TRiGGER_start"$PATH"TRiGGER_end | /bin/grep 'TRIGGER_start\.TRIGGER_end' >/dev/null 2>&1

	if test $? = 0; then

		/bin/echo -e "\nYou seem to have the current working directory in your"

		/bin/echo -e "PATH environment variable. This doesn't work.\n"

		exit 1;

	fi

fi;



# Verify that which is installed

if ! which which > /dev/null ; then

	/bin/echo -e "\nYou must install 'which' on your build machine\n";