Mercurial > hg > openttd

changeset 20728:eb193a82e392 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r25642) -Fix (r25638): Compilation with static ICU
author planetmaker <planetmaker@openttd.org>
date Wed, 31 Jul 2013 18:09:21 +0000
parents 60958335fe0f
children ea20edff1862
files config.lib
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/config.lib
+++ b/config.lib
@@ -1718,9 +1718,9 @@
 
 		# Some icu-configs have the 'feature' of not adding a space where others do add the space
 		if [ "$static_icu" != "0" ]; then
-			LIBS="$LIBS `$icu_config --ldflags-searchpath` `$icu_config --ldflags-libsonly` `$icu_config --ldflags-layout | tr '\n\r' '  ' | sed s/licu/lsicu/g`"
+			LIBS="$LIBS `$icu_config --ldflags-searchpath` `($icu_config --ldflags-libsonly; $icu_config --ldflags-layout) | tr '\n\r' '  ' | sed s/licu/lsicu/g`"
 		else
-			LIBS="$LIBS `$icu_config --ldflags-searchpath` `$icu_config --ldflags-libsonly` `$icu_config --ldflags-layout | tr '\n\r' '  '`"
+			LIBS="$LIBS `$icu_config --ldflags-searchpath` `($icu_config --ldflags-libsonly; $icu_config --ldflags-layout) | tr '\n\r' '  '`"
 		fi
 	fi