From d59e28e49204ed609d8a1bf3c0f21ab5fc178337 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 28 Aug 2012 19:08:36 -0400 Subject: [PATCH] Minor --- src/Makefile.am | 6 +++++- src/check-libstdc++.sh | 2 +- src/check-static-inits.sh | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 166ba790c..d7c4560b6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -252,7 +252,6 @@ dist_check_SCRIPTS = \ check-exported-symbols.sh \ check-includes.sh \ check-internal-symbols.sh \ - check-static-inits.sh \ $(NULL) if HAVE_ICU @@ -260,6 +259,11 @@ else dist_check_SCRIPTS += check-libstdc++.sh endif +if HAVE_ICU_LE +else +dist_check_SCRIPTS += check-static-inits.sh +endif + TESTS = $(dist_check_SCRIPTS) TESTS_ENVIRONMENT = \ srcdir="$(srcdir)" \ diff --git a/src/check-libstdc++.sh b/src/check-libstdc++.sh index 05215324b..e7e0e295e 100755 --- a/src/check-libstdc++.sh +++ b/src/check-libstdc++.sh @@ -27,7 +27,7 @@ for suffix in so dylib; do fi done if ! $tested; then - echo "check-internal-symbols.sh: libharfbuzz shared library not found; skipping test" + echo "check-libstdc++.sh: libharfbuzz shared library not found; skipping test" exit 77 fi diff --git a/src/check-static-inits.sh b/src/check-static-inits.sh index 1eceb1bad..bb0a7ff63 100755 --- a/src/check-static-inits.sh +++ b/src/check-static-inits.sh @@ -28,10 +28,10 @@ for obj in $OBJS; do fi done -echo "Checking that no object file has lazy static C++ constructors/destructors" +echo "Checking that no object file has lazy static C++ constructors/destructors or other such stuff" for obj in $OBJS; do if objdump -t "$obj" | grep '__c'; then - echo "Ouch, $obj has lazy static C++ constructors/destructors" + echo "Ouch, $obj has lazy static C++ constructors/destructors or other such stuff" stat=1 fi done