diff options
| author | Santiago Fernandez Madero <safern@microsoft.com> | 2020-02-19 04:06:11 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-19 04:06:11 +0300 |
| commit | 4365af16fcf99708df04315b19eadee6e533e4bd (patch) | |
| tree | ce457d664bab5baa9990d3cdb60506d99461d4ba /src/coreclr/CMakeLists.txt | |
| parent | e771456512f1c5a1a8e443c8ff6307a9a3425d62 (diff) | |
Convert System.Globalization unix calls to QCalls into coreclr (#32132)
* Convert System.Globalization unix calls to QCalls into coreclr
* Fix build errors, define UChar instead of using uint16_t
* Fix indentation in some header files
* Add libraries-native library to define qcalls entrypoints for libraries native shims
* Change DLLEXPORT to PALEXPORT and declare visibility hidden when in entrypoints.c
* Fix build and PALEXPORT definition
* Fix mono tests
* Fix System.Globalization tests by getting the icu version via NativeLibrary.Load
* Fix full framework build
* PR Feedback
* Revert changes in Interop.Libraries.cs
* Fix build and default version to 0.0.0.0 if pinvoke not found
* Remove __LIB_NATIVE_ENTRYPOINTS define and move icu headers to internal header file
* Add GetICUVersion to trimmer xml for mono and PR Feedback
* PR Feedback: move mono link entry to bottom
Diffstat (limited to 'src/coreclr/CMakeLists.txt')
| -rw-r--r-- | src/coreclr/CMakeLists.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/coreclr/CMakeLists.txt b/src/coreclr/CMakeLists.txt index 5a33d25d6fa..d51dc5ed3cb 100644 --- a/src/coreclr/CMakeLists.txt +++ b/src/coreclr/CMakeLists.txt @@ -131,7 +131,12 @@ endif(CLR_CROSS_COMPONENTS_BUILD) #------------------- include(pgosupport.cmake) -add_subdirectory(src/libraries-native) +#------------------------------- +# Include libraries native shims +#------------------------------- +if(NOT CLR_CROSS_COMPONENTS_BUILD) + add_subdirectory(src/libraries-native) +endif(NOT CLR_CROSS_COMPONENTS_BUILD) #----------------------------------------- # Add Projects |