Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 287225 | Differences between
and this patch

Collapse All | Expand All

(-)toolchain-funcs.eclass.old (-3 / +5 lines)
Lines 187-193 Link Here
187
			# Starting with linux-2.6.24, the 'x86_64' and 'i386'
187
			# Starting with linux-2.6.24, the 'x86_64' and 'i386'
188
			# trees have been unified into 'x86'.
188
			# trees have been unified into 'x86'.
189
			# FreeBSD still uses i386
189
			# FreeBSD still uses i386
190
			if [[ ${type} == "kern" ]] && [[ $(KV_to_int ${KV}) -lt $(KV_to_int 2.6.24) || ${host} == *freebsd* ]] ; then
190
			# In 2.6.32, this has been changed back.
191
			if [[ ${type} == "kern" ]] && [[ $(KV_to_int ${KV}) -lt $(KV_to_int 2.6.24) ]] || [[ $(KV_to_int ${KV}) -ge $(KV_to_int 2.6.32) ]] || ${host} == *freebsd* ]] ; then
191
				echo i386
192
				echo i386
192
			else
193
			else
193
				echo x86
194
				echo x86
Lines 230-239 Link Here
230
		x86_64*)
231
		x86_64*)
231
			# Starting with linux-2.6.24, the 'x86_64' and 'i386'
232
			# Starting with linux-2.6.24, the 'x86_64' and 'i386'
232
			# trees have been unified into 'x86'.
233
			# trees have been unified into 'x86'.
233
			if [[ ${type} == "kern" ]] && [[ $(KV_to_int ${KV}) -ge $(KV_to_int 2.6.24) ]] ; then
234
			# In 2.6.32-rc1, this has been changed back.
235
			if [[ ${type} == "kern" ]] && [[ $(KV_to_int ${KV}) -ge $(KV_to_int 2.6.24) ]] && [[ $(KV_to_int ${KV}) -lt $(KV_to_int 2.6.32) ]] ; then
234
				echo x86
236
				echo x86
235
			else
237
			else
236
				ninj x86_64 amd64
238
				echo x86_64
237
			fi
239
			fi
238
			;;
240
			;;
239
241

Return to bug 287225