Merge pull request #875 from dm0-/glsa

dm0- · web-flow · commit 471dd4c1968b · 2019-08-08T16:09:40.000-04:00
Revert "build_library: Add temporary workaround for binutils update"
diff --git a/build_library/toolchain_util.sh b/build_library/toolchain_util.sh
@@ -188,7 +188,7 @@ get_cross_pkgs() {
 }
 
 # Get portage arguments restricting toolchains to binary packages only.
-get_binonly_args() { return ;
+get_binonly_args() {
     local pkgs=( "${TOOLCHAIN_PKGS[@]}" $(get_cross_pkgs "$@") )
     echo "${pkgs[@]/#/--useoldpkg-atoms=}" "${pkgs[@]/#/--rebuild-exclude=}"
 }

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ get_cross_pkgs() {`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`# Get portage arguments restricting toolchains to binary packages only.`
`191`		`-get_binonly_args() { return ;`
	`191`	`+get_binonly_args() {`
`192`	`192`	`local pkgs=( "${TOOLCHAIN_PKGS[@]}" $(get_cross_pkgs "$@") )`
`193`	`193`	`echo "${pkgs[@]/#/--useoldpkg-atoms=}" "${pkgs[@]/#/--rebuild-exclude=}"`
`194`	`194`	`}`