diff --git a/configure b/configure
index db7f610e38..c72fad1154 100755
--- a/configure
+++ b/configure
@@ -1039,12 +1039,9 @@ else
 			get_build_tool_path ELFEDIT_$targetArch elfedit
 		elif [ -n "$crossToolsPrefix" ]; then
 			get_build_tool_path LD_$targetArch ${crossToolsPrefix}ld
-			case `get_variable HAIKU_GCC_RAW_VERSION_$targetArch` in
-				4.*|5.*|6.*|7.*|8.*)
-					get_build_tool_path ELFEDIT_$targetArch \
-						${crossToolsPrefix}elfedit
-				;;
-			esac
+			if [ `get_variable HAIKU_CC_IS_LEGACY_GCC_$targetArch` -eq 0 ]; then
+				get_build_tool_path ELFEDIT_$targetArch ${crossToolsPrefix}elfedit
+			fi
 		fi
 		if [ -n "$crossToolsPrefix" ]; then
 			get_build_tool_path AR_$targetArch ${crossToolsPrefix}ar