mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-17 14:49:30 -07:00
7058c758b8
- rebase disable_icu_rpath patch: path_options was renamed upstream - disable b2's warnings-as-errors globally instead of patching subprojects one by one; supersedes 1.88.0-bind-no-Werror.patch - callable_traits, redis, serialization and graph tests now pass - exclude more tests when tc-is-clang Part-of: https://codeberg.org/gentoo/gentoo/pulls/1743 Merges: https://codeberg.org/gentoo/gentoo/pulls/1743 Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com> Signed-off-by: David Seifert <soap@gentoo.org>
20 lines
581 B
Diff
20 lines
581 B
Diff
--- a/libs/locale/build/Jamfile.v2
|
|
+++ b/libs/locale/build/Jamfile.v2
|
|
@@ -99,16 +99,6 @@ if $(.icu-path)
|
|
rule icu_search_paths ( properties * )
|
|
{
|
|
local result ;
|
|
- if <address-model>64 in $(properties) && <toolset>msvc in $(properties)
|
|
- {
|
|
- debug-message Search 64 bit ICU in "$(.icu-path)/lib64" ;
|
|
- result = <search>$(.icu-path)/bin64 <search>$(.icu-path)/lib64 ;
|
|
- }
|
|
- else
|
|
- {
|
|
- debug-message Search ICU in "$(.icu-path)/lib" ;
|
|
- result = <search>$(.icu-path)/bin <search>$(.icu-path)/lib ;
|
|
- }
|
|
return $(result) ;
|
|
}
|
|
|