summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHyeongseok Oh <hseok82.oh@samsung.com>2017-02-28 22:09:37 +0900
committerJan Vorlicek <janvorli@microsoft.com>2017-02-28 14:09:37 +0100
commit67032ee80de8d219146b9ac192609884f784f23b (patch)
tree65194d3147b05ff7766a46416195dc0101bf4248
parentb0a0d52e7d273a46ec6e2c39dbc816d98dcbe217 (diff)
downloadcoreclr-67032ee80de8d219146b9ac192609884f784f23b.tar.gz
coreclr-67032ee80de8d219146b9ac192609884f784f23b.tar.bz2
coreclr-67032ee80de8d219146b9ac192609884f784f23b.zip
Fix cross component builderror - CMakeLists.txt for PAL (#9819)
define & use PAL_ARCH_SOURCES_DIR in PAL CMakeLists.txt to build assembly based on platform architecture. root/CMakeLists.txt defines ARCH_SOURCES_DIR based on target architecture.
-rw-r--r--src/pal/src/CMakeLists.txt16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/pal/src/CMakeLists.txt b/src/pal/src/CMakeLists.txt
index dae0f3fe3f..192c8c0bbb 100644
--- a/src/pal/src/CMakeLists.txt
+++ b/src/pal/src/CMakeLists.txt
@@ -77,13 +77,17 @@ add_definitions(-D_FILE_OFFSET_BITS=64)
if(PAL_CMAKE_PLATFORM_ARCH_AMD64)
add_definitions(-DBIT64=1)
add_definitions(-D_WIN64=1)
+ set(PAL_ARCH_SOURCES_DIR amd64)
elseif(PAL_CMAKE_PLATFORM_ARCH_ARM)
add_definitions(-DBIT32=1)
+ set(PAL_ARCH_SOURCES_DIR arm)
elseif(PAL_CMAKE_PLATFORM_ARCH_ARM64)
add_definitions(-DBIT64=1)
add_definitions(-D_WIN64=1)
+ set(PAL_ARCH_SOURCES_DIR arm64)
elseif(PAL_CMAKE_PLATFORM_ARCH_I386)
add_definitions(-DBIT32=1)
+ set(PAL_ARCH_SOURCES_DIR i386)
endif()
if(CMAKE_SYSTEM_NAME STREQUAL Linux AND NOT CLR_CMAKE_PLATFORM_ALPINE_LINUX)
@@ -102,16 +106,16 @@ set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} -Wl,--no
add_compile_options(-fPIC)
set(ARCH_SOURCES
- arch/${ARCH_SOURCES_DIR}/context2.S
- arch/${ARCH_SOURCES_DIR}/debugbreak.S
- arch/${ARCH_SOURCES_DIR}/exceptionhelper.S
- arch/${ARCH_SOURCES_DIR}/processor.cpp
+ arch/${PAL_ARCH_SOURCES_DIR}/context2.S
+ arch/${PAL_ARCH_SOURCES_DIR}/debugbreak.S
+ arch/${PAL_ARCH_SOURCES_DIR}/exceptionhelper.S
+ arch/${PAL_ARCH_SOURCES_DIR}/processor.cpp
)
if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
list(APPEND PLATFORM_SOURCES
- arch/${ARCH_SOURCES_DIR}/callsignalhandlerwrapper.S
- arch/${ARCH_SOURCES_DIR}/signalhandlerhelper.cpp
+ arch/${PAL_ARCH_SOURCES_DIR}/callsignalhandlerwrapper.S
+ arch/${PAL_ARCH_SOURCES_DIR}/signalhandlerhelper.cpp
)
endif(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)