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

Collapse All | Expand All

(-)a/dev-lang/rust/rust-1.50.0.ebuild (+14 lines)
Lines 260-265 src_configure() { Link Here
260
	fi
260
	fi
261
261
262
	rust_target="$(rust_abi)"
262
	rust_target="$(rust_abi)"
263
	llvm_libunwind="no" # Formerly false, see https://github.com/rust-lang/rust/blob/master/config.toml.example
264
	if tc-is-clang; then
265
		local compiler_rt=$($(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -print-libgcc-file-name)
266
		if [[ ${compiler_rt} == *libclang_rt* ]]; then
267
			if has_version sys-libs/llvm-libunwind; then
268
				einfo "Linking with llvm-libunwind"
269
				llvm_libunwind="in-tree" # Formerly true
270
			else
271
				einfo "Linking with gcc_s unwinder"
272
				llvm_libunwind="no"
273
			fi
274
		fi
275
	fi
263
276
264
	cat <<- _EOF_ > "${S}"/config.toml
277
	cat <<- _EOF_ > "${S}"/config.toml
265
		[llvm]
278
		[llvm]
Lines 316-321 src_configure() { Link Here
316
		lld = $(usex system-llvm false $(toml_usex wasm))
329
		lld = $(usex system-llvm false $(toml_usex wasm))
317
		backtrace-on-ice = true
330
		backtrace-on-ice = true
318
		jemalloc = false
331
		jemalloc = false
332
		llvm-libunwind = "${llvm_libunwind}"
319
		[dist]
333
		[dist]
320
		src-tarball = false
334
		src-tarball = false
321
	_EOF_
335
	_EOF_

Return to bug 733242