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/pal | |
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/pal')
-rw-r--r-- | src/pal/src/CMakeLists.txt | 22 | ||||
-rw-r--r-- | src/pal/tests/CMakeLists.txt | 22 | ||||
-rw-r--r-- | src/pal/tests/palsuite/eventprovider/CMakeLists.txt | 2 |
3 files changed, 23 insertions, 23 deletions
diff --git a/src/pal/src/CMakeLists.txt b/src/pal/src/CMakeLists.txt index 28f5bfb41d..6d8d92f0eb 100644 --- a/src/pal/src/CMakeLists.txt +++ b/src/pal/src/CMakeLists.txt @@ -123,25 +123,25 @@ if(CMAKE_SYSTEM_NAME STREQUAL Darwin) ) endif(CMAKE_SYSTEM_NAME STREQUAL Darwin) -add_definitions(-DPLATFORM_UNIX=1) -add_definitions(-DLP64COMPATIBLE=1) -add_definitions(-DFEATURE_PAL=1) -add_definitions(-DCORECLR=1) -add_definitions(-DPIC=1) +add_definitions(-DPLATFORM_UNIX) +add_definitions(-DLP64COMPATIBLE) +add_definitions(-DFEATURE_PAL) +add_definitions(-DCORECLR) +add_definitions(-DPIC) add_definitions(-D_FILE_OFFSET_BITS=64) if(PAL_CMAKE_PLATFORM_ARCH_AMD64) - add_definitions(-DBIT64=1) - add_definitions(-D_WIN64=1) + add_definitions(-DBIT64) + add_definitions(-D_WIN64) set(PAL_ARCH_SOURCES_DIR amd64) elseif(PAL_CMAKE_PLATFORM_ARCH_ARM) - add_definitions(-DBIT32=1) + add_definitions(-DBIT32) set(PAL_ARCH_SOURCES_DIR arm) elseif(PAL_CMAKE_PLATFORM_ARCH_ARM64) - add_definitions(-DBIT64=1) - add_definitions(-D_WIN64=1) + add_definitions(-DBIT64) + add_definitions(-D_WIN64) set(PAL_ARCH_SOURCES_DIR arm64) elseif(PAL_CMAKE_PLATFORM_ARCH_I386) - add_definitions(-DBIT32=1) + add_definitions(-DBIT32) set(PAL_ARCH_SOURCES_DIR i386) endif() diff --git a/src/pal/tests/CMakeLists.txt b/src/pal/tests/CMakeLists.txt index 0ec630df8c..24a9e7b74a 100644 --- a/src/pal/tests/CMakeLists.txt +++ b/src/pal/tests/CMakeLists.txt @@ -11,21 +11,21 @@ elseif(CLR_CMAKE_PLATFORM_ARCH_ARM64) endif() # Compile options -add_definitions(-DPLATFORM_UNIX=1) -add_definitions(-DLP64COMPATIBLE=1) -add_definitions(-DFEATURE_PAL=1) -add_definitions(-DCORECLR=1) -add_definitions(-DPIC=1) +add_definitions(-DPLATFORM_UNIX) +add_definitions(-DLP64COMPATIBLE) +add_definitions(-DFEATURE_PAL) +add_definitions(-DCORECLR) +add_definitions(-DPIC) if(PAL_CMAKE_PLATFORM_ARCH_I386) - add_definitions(-DBIT32=1) + add_definitions(-DBIT32) elseif(PAL_CMAKE_PLATFORM_ARCH_AMD64) - add_definitions(-DBIT64=1) - add_definitions(-D_WIN64=1) + add_definitions(-DBIT64) + add_definitions(-D_WIN64) elseif(PAL_CMAKE_PLATFORM_ARCH_ARM) - add_definitions(-DBIT32=1) + add_definitions(-DBIT32) elseif(PAL_CMAKE_PLATFORM_ARCH_ARM64) - add_definitions(-DBIT64=1) - add_definitions(-D_WIN64=1) + add_definitions(-DBIT64) + add_definitions(-D_WIN64) else() message(FATAL_ERROR "Only ARM, ARM64, I386, and AMD64 is supported") endif() diff --git a/src/pal/tests/palsuite/eventprovider/CMakeLists.txt b/src/pal/tests/palsuite/eventprovider/CMakeLists.txt index f74fc9b604..8b43aad633 100644 --- a/src/pal/tests/palsuite/eventprovider/CMakeLists.txt +++ b/src/pal/tests/palsuite/eventprovider/CMakeLists.txt @@ -26,7 +26,7 @@ add_executable(eventprovidertest ) set(EVENT_PROVIDER_DEPENDENCIES "") if(FEATURE_EVENT_TRACE) - add_definitions(-DFEATURE_EVENT_TRACE=1) + add_definitions(-DFEATURE_EVENT_TRACE) list(APPEND EVENT_PROVIDER_DEPENDENCIES eventprovider ) |