--- eclass/llvm.eclass~	2017-02-28 19:50:50.000000000 +0000
+++ eclass/llvm.eclass~	2017-06-27 19:51:52.546508243 +0000
@@ -130,7 +130,20 @@ 
 	debug-print-function ${FUNCNAME} "${@}"
 
 	if [[ ${MERGE_TYPE} != binary ]]; then
-		export PATH=$(get_llvm_prefix ${LLVM_MAX_SLOT})/bin:${PATH}
+		local -a new_path
+		local llvm_bindir=$(get_llvm_prefix ${LLVM_MAX_SLOT})/bin
+		local IFS=:
+		set ${PATH}
+		while (( ${#} )) && ! [[ -x ${1}/llvm-config ]] ; do
+			[[ ${1} != ${llvm_bindir} ]] && new_path+=( "${1}" )
+			shift
+		done
+		new_path+=( "${llvm_bindir}" )
+		while (( ${#} )) ; do
+			[[ ${1} != ${llvm_bindir} ]] && new_path+=( "${1}" )
+			shift
+		done
+		export PATH=${new_path[*]}
 	fi
 }