diff options
| author | Peter Jas <necmon@yahoo.com> | 2016-05-30 12:54:02 +0300 |
|---|---|---|
| committer | Jan Vorlicek <janvorli@microsoft.com> | 2016-05-30 11:54:02 +0200 |
| commit | 352df35c124104586ee4c977556cb50ce720af62 (patch) | |
| tree | efa1b7df106f087a18abd36208ead57d66adf1c6 /src/corefx | |
| parent | 41912e3adb789b62f4cb46acffe915b6f1ab0e1e (diff) | |
| download | coreclr-352df35c124104586ee4c977556cb50ce720af62.tar.gz coreclr-352df35c124104586ee4c977556cb50ce720af62.tar.bz2 coreclr-352df35c124104586ee4c977556cb50ce720af62.zip | |
Fix ucol_setMaxVariable detection for Gentoo Linux (#5309)
The issue was the symbol is exported by the ICU lib. Including headers
was not enough. The linker requires the libraries to succeed.
With this fix, CoreCLR successfully builds on Gentoo Linux 100%.
Tested with LXC gentoo container on Ubuntu machine.
Steps to configure and build:
https://gist.github.com/jasonwilliams200OK/1a2e2c0e904ffa95faf6333fcd88d9b8
Fix #5160
Diffstat (limited to 'src/corefx')
| -rw-r--r-- | src/corefx/System.Globalization.Native/configure.cmake | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/corefx/System.Globalization.Native/configure.cmake b/src/corefx/System.Globalization.Native/configure.cmake index 4250c7c4b1..138127e003 100644 --- a/src/corefx/System.Globalization.Native/configure.cmake +++ b/src/corefx/System.Globalization.Native/configure.cmake @@ -8,11 +8,18 @@ CHECK_CXX_SOURCE_COMPILES(" int main() { UDateFormatSymbolType e = UDAT_STANDALONE_SHORTER_WEEKDAYS; } " HAVE_UDAT_STANDALONE_SHORTER_WEEKDAYS) +if(NOT CLR_CMAKE_PLATFORM_DARWIN) + set(CMAKE_REQUIRED_LIBRARIES ${ICUUC} ${ICUI18N}) +else() + set(CMAKE_REQUIRED_LIBRARIES ${ICUCORE}) +endif() + check_symbol_exists( ucol_setMaxVariable "unicode/ucol.h" HAVE_SET_MAX_VARIABLE) +unset(CMAKE_REQUIRED_LIBRARIES) unset(CMAKE_REQUIRED_INCLUDES) configure_file( |