summaryrefslogtreecommitdiff
path: root/modules/hard-locale-tests
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2020-01-01 16:42:49 +0100
committerBruno Haible <bruno@clisp.org>2020-01-01 16:42:49 +0100
commitbae00563655683adc5b14256dc2b85c2e8674605 (patch)
tree4fe6e1bb4a0a33000d747eb1ed55092a5617b2d2 /modules/hard-locale-tests
parent15cd8caa2aac6e2a37ee82a095275492bebae2bb (diff)
downloadgnulib-bae00563655683adc5b14256dc2b85c2e8674605.tar.gz
hard-locale tests: Fix a conflict with the C++ tests.
* modules/hard-locale-tests (Makefile.am): Build a program named 'current-locale', not 'locale'.
Diffstat (limited to 'modules/hard-locale-tests')
-rw-r--r--modules/hard-locale-tests5
1 files changed, 4 insertions, 1 deletions
diff --git a/modules/hard-locale-tests b/modules/hard-locale-tests
index ddd101f175..ac7fcb2a67 100644
--- a/modules/hard-locale-tests
+++ b/modules/hard-locale-tests
@@ -15,5 +15,8 @@ AC_CHECK_FUNCS_ONCE([duplocale])
Makefile.am:
TESTS += test-hard-locale
check_PROGRAMS += test-hard-locale
-noinst_PROGRAMS += locale
test_hard_locale_LDADD = $(LDADD) $(LIB_SETLOCALE) @LIB_HARD_LOCALE@
+# We cannot call this program 'locale', because the C++ compiler on Mac OS X
+# would then barf upon '#include <locale>'. So, call it 'current-locale'.
+noinst_PROGRAMS += current-locale
+current_locale_SOURCES = locale.c