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 /configurecompiler.cmake | |
| 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 'configurecompiler.cmake')
| -rw-r--r-- | configurecompiler.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/configurecompiler.cmake b/configurecompiler.cmake index a5e44bbc4e..41da56307b 100644 --- a/configurecompiler.cmake +++ b/configurecompiler.cmake @@ -366,7 +366,7 @@ if (CLR_CMAKE_PLATFORM_ARCH_AMD64) add_definitions(-D_AMD64_) add_definitions(-D_WIN64) add_definitions(-DAMD64) - add_definitions(-DBIT64=1) + add_definitions(-DBIT64) elseif (CLR_CMAKE_PLATFORM_ARCH_I386) add_definitions(-D_X86_) elseif (CLR_CMAKE_PLATFORM_ARCH_ARM) @@ -376,7 +376,7 @@ elseif (CLR_CMAKE_PLATFORM_ARCH_ARM64) add_definitions(-D_ARM64_) add_definitions(-DARM64) add_definitions(-D_WIN64) - add_definitions(-DBIT64=1) + add_definitions(-DBIT64) else () clr_unknown_arch() endif () @@ -402,7 +402,7 @@ if (CLR_CMAKE_PLATFORM_UNIX) endif(CLR_CMAKE_PLATFORM_UNIX) if (CLR_CMAKE_PLATFORM_UNIX) - add_definitions(-DPLATFORM_UNIX=1) + add_definitions(-DPLATFORM_UNIX) if(CLR_CMAKE_PLATFORM_DARWIN) message("Detected OSX x86_64") @@ -418,7 +418,7 @@ if (CLR_CMAKE_PLATFORM_UNIX) endif(CLR_CMAKE_PLATFORM_UNIX) if (WIN32) - add_definitions(-DPLATFORM_WINDOWS=1) + add_definitions(-DPLATFORM_WINDOWS) # Define the CRT lib references that link into Desktop imports set(STATIC_MT_CRT_LIB "libcmt$<$<OR:$<CONFIG:Debug>,$<CONFIG:Checked>>:d>.lib") |