diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP index 5ba4dd44fe..521357b00e 100644 --- a/MANIFEST.SKIP +++ b/MANIFEST.SKIP @@ -1018,6 +1018,8 @@ ^/test\.pdb/ ^/tools/dev/mk_language_shell\.pl$ ^/tools/dev/mk_language_shell\.pl/ +^/tools/dev/pbc_to_exe\.pir$ +^/tools/dev/pbc_to_exe\.pir/ ^/vc60\.pdb$ ^/vc60\.pdb/ ^/vc70\.pdb$ diff --git a/config/auto/icu.pm b/config/auto/icu.pm index b0560c4fd6..4cbda42a76 100644 --- a/config/auto/icu.pm +++ b/config/auto/icu.pm @@ -278,8 +278,8 @@ sub _try_icuconfig { $arg->{icuconfig} ) { # ldflags - $conf->debug("Trying $arg->{icuconfig} with '--ldflags-libsonly'\n"); - $icushared = capture_output("$arg->{icuconfig} --ldflags-libsonly"); + $conf->debug("Trying $arg->{icuconfig} with '--ldflags-searchpath --ldflags-libsonly'\n"); + $icushared = capture_output("$arg->{icuconfig} --ldflags-searchpath --ldflags-libsonly"); chomp $icushared; $conf->debug("icushared: captured $icushared\n"); ($icushared, $arg->{without}) = diff --git a/t/steps/auto/icu-01.t b/t/steps/auto/icu-01.t index 68d3e376c3..1339644b6b 100644 --- a/t/steps/auto/icu-01.t +++ b/t/steps/auto/icu-01.t @@ -665,7 +665,7 @@ $conf->replenish($serialized); \$stdout, \$stderr, ); - like($stdout, qr/Trying $icuconfig with '--ldflags'/s, + like($stdout, qr/Trying $icuconfig with '--ldflags/s, "Got expected verbose output re --ldflags"); like($stdout, qr/icushared: captured/s, "Got expected verbose output re icushared");