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/jit | |
| 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/jit')
| -rw-r--r-- | src/jit/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/jit/armelnonjit/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/jit/protononjit/CMakeLists.txt | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/jit/CMakeLists.txt b/src/jit/CMakeLists.txt index 8a3475605b..b2572a8e6b 100644 --- a/src/jit/CMakeLists.txt +++ b/src/jit/CMakeLists.txt @@ -14,7 +14,7 @@ if (CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_ARCH_ARM64 OR (CLR_CMAKE_TAR endif () # JIT_BUILD disables certain PAL_TRY debugging features -add_definitions(-DJIT_BUILD=1) +add_definitions(-DJIT_BUILD) if(WIN32) set(JIT_RESOURCES Native.rc) diff --git a/src/jit/armelnonjit/CMakeLists.txt b/src/jit/armelnonjit/CMakeLists.txt index cccba304da..e6d1b2705e 100644 --- a/src/jit/armelnonjit/CMakeLists.txt +++ b/src/jit/armelnonjit/CMakeLists.txt @@ -13,13 +13,13 @@ if(FEATURE_READYTORUN) endif(FEATURE_READYTORUN) if (CLR_CMAKE_PLATFORM_ARCH_I386) - remove_definitions(-D_TARGET_X86_=1) + remove_definitions(-D_TARGET_X86_) add_definitions(-D_TARGET_ARM_) - add_definitions(-DARM_SOFTFP=1) + add_definitions(-DARM_SOFTFP) set(JIT_ARCH_ALTJIT_SOURCES ${JIT_ARM_SOURCES}) set(JIT_ARCH_LINK_LIBRARIES gcinfo_arm) elseif(CLR_CMAKE_PLATFORM_ARCH_AMD64) - remove_definitions(-D_TARGET_AMD64_=1) + remove_definitions(-D_TARGET_AMD64_) add_definitions(-D_TARGET_ARM64_) set(JIT_ARCH_ALTJIT_SOURCES ${JIT_ARM64_SOURCES}) set(JIT_ARCH_LINK_LIBRARIES gcinfo_arm64) diff --git a/src/jit/protononjit/CMakeLists.txt b/src/jit/protononjit/CMakeLists.txt index f921763e25..dfe67f5423 100644 --- a/src/jit/protononjit/CMakeLists.txt +++ b/src/jit/protononjit/CMakeLists.txt @@ -10,14 +10,14 @@ if(FEATURE_READYTORUN) endif(FEATURE_READYTORUN) if (CLR_CMAKE_PLATFORM_ARCH_I386) - remove_definitions(-D_TARGET_X86_=1) + remove_definitions(-D_TARGET_X86_) remove_definitions(-DFEATURE_SIMD) remove_definitions(-DFEATURE_HW_INTRINSICS) add_definitions(-D_TARGET_ARM_) set(JIT_ARCH_ALTJIT_SOURCES ${JIT_ARM_SOURCES}) set(JIT_ARCH_LINK_LIBRARIES gcinfo_arm) elseif(CLR_CMAKE_PLATFORM_ARCH_AMD64) - remove_definitions(-D_TARGET_AMD64_=1) + remove_definitions(-D_TARGET_AMD64_) add_definitions(-D_TARGET_ARM64_) set(JIT_ARCH_ALTJIT_SOURCES ${JIT_ARM64_SOURCES}) set(JIT_ARCH_LINK_LIBRARIES gcinfo_arm64) |