diff options
| author | Jeremy Koritzinsky <jkoritzinsky@gmail.com> | 2019-06-06 14:43:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-06 14:43:54 -0700 |
| commit | 4c82068adb046eee3573984392a0d1e774062ae0 (patch) | |
| tree | c94ee1b120f165f121101b7dc368fa2c57dd5f0a /src/corefx | |
| parent | 2e9cd827b0db60ad42f7df1f34ee1fada1951e5f (diff) | |
| download | coreclr-4c82068adb046eee3573984392a0d1e774062ae0.tar.gz coreclr-4c82068adb046eee3573984392a0d1e774062ae0.tar.bz2 coreclr-4c82068adb046eee3573984392a0d1e774062ae0.zip | |
Use CMake's C# support to build DacTableGen instead of manually invoking csc.exe ourselves. (#24342)
* Use CMake's C# support to build DacTableGen instead of manually invoking csc.exe ourselves.
* Fix x86 failures.
* Disable DAC generation when building with NMake Makefiles and issue an error since the CMake C# support is VS-only. We don't actually support building with NMake (only configure) so this is ok.
* Clean up rest of the macro=1's
PR Feedback.
* Fix Visual Studio generator matching.
* Explicitly specify anycpu32bitpreferred for DacTableGen so the ARM64 build doesn't accidentally make it 64-bit
* Fix bad merge
Diffstat (limited to 'src/corefx')
| -rw-r--r-- | src/corefx/System.Globalization.Native/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corefx/System.Globalization.Native/CMakeLists.txt b/src/corefx/System.Globalization.Native/CMakeLists.txt index 3d2518d45b..1d4c946f23 100644 --- a/src/corefx/System.Globalization.Native/CMakeLists.txt +++ b/src/corefx/System.Globalization.Native/CMakeLists.txt @@ -2,8 +2,8 @@ project(System.Globalization.Native C) set(CMAKE_INCLUDE_CURRENT_DIR ON) -add_definitions(-DPIC=1) -add_definitions(-DBIT64=1) +add_definitions(-DPIC) +add_definitions(-DBIT64) set(ICU_HOMEBREW_INC_PATH "/usr/local/opt/icu4c/include") @@ -85,7 +85,7 @@ else() dl ) - add_definitions(-DU_DISABLE_RENAMING=1) + add_definitions(-DU_DISABLE_RENAMING) endif() verify_dependencies( |