diff options
| author | Pat Gavlin <pgavlin@gmail.com> | 2016-04-20 17:34:45 -0700 |
|---|---|---|
| committer | Pat Gavlin <pgavlin@gmail.com> | 2016-04-20 17:34:45 -0700 |
| commit | 9e7f0fe5095be446c5dc801e9841e8cfee2c9b74 (patch) | |
| tree | 250baa90605d03dab51751fed3b7558b308c5bea /src/jit | |
| parent | 354b777f798cd5ebb85894a721f5bb4c1e9b49f5 (diff) | |
| parent | 604d13b2c196afc7130e094449df932ab1e03164 (diff) | |
| download | coreclr-9e7f0fe5095be446c5dc801e9841e8cfee2c9b74.tar.gz coreclr-9e7f0fe5095be446c5dc801e9841e8cfee2c9b74.tar.bz2 coreclr-9e7f0fe5095be446c5dc801e9841e8cfee2c9b74.zip | |
Merge pull request #4449 from pgavlin/JitBuildName
Change the names of the JIT products to `clrjit`.
Diffstat (limited to 'src/jit')
| -rw-r--r-- | src/jit/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/jit/crossgen/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/jit/dll/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/jit/standalone/CMakeLists.txt | 6 |
4 files changed, 13 insertions, 8 deletions
diff --git a/src/jit/CMakeLists.txt b/src/jit/CMakeLists.txt index 577be87966..f54a1740ad 100644 --- a/src/jit/CMakeLists.txt +++ b/src/jit/CMakeLists.txt @@ -168,10 +168,15 @@ endif() set(CLR_EXPORTED_SYMBOL_FILE ${CLRJIT_EXPORTS_DEF}) +set(JIT_BASE_NAME clrjit) +if (CLR_BUILD_JIT32) + set(JIT_BASE_NAME ryujit) +endif() + add_subdirectory(dll) add_subdirectory(crossgen) add_subdirectory(standalone) if (CLR_CMAKE_PLATFORM_ARCH_I386 OR CLR_CMAKE_PLATFORM_ARCH_ARM) add_subdirectory(protojit) -endif (CLR_CMAKE_PLATFORM_ARCH_I386 OR CLR_CMAKE_PLATFORM_ARCH_ARM)
\ No newline at end of file +endif (CLR_CMAKE_PLATFORM_ARCH_I386 OR CLR_CMAKE_PLATFORM_ARCH_ARM) diff --git a/src/jit/crossgen/CMakeLists.txt b/src/jit/crossgen/CMakeLists.txt index 981369e768..f79d9e72ce 100644 --- a/src/jit/crossgen/CMakeLists.txt +++ b/src/jit/crossgen/CMakeLists.txt @@ -4,4 +4,4 @@ if(CLR_CMAKE_TARGET_ARCH_I386 OR CLR_CMAKE_TARGET_ARCH_ARM) add_definitions(-DLEGACY_BACKEND) endif() -add_library_clr(jit_crossgen ${SOURCES}) +add_library_clr(${JIT_BASE_NAME}_crossgen ${SOURCES}) diff --git a/src/jit/dll/CMakeLists.txt b/src/jit/dll/CMakeLists.txt index e4da4f17bb..583bc98a53 100644 --- a/src/jit/dll/CMakeLists.txt +++ b/src/jit/dll/CMakeLists.txt @@ -9,13 +9,13 @@ if(CLR_CMAKE_PLATFORM_UNIX) add_compile_options(-fPIC) add_definitions(-DFEATURE_MERGE_JIT_AND_ENGINE) - add_library_clr(ClrJit + add_library_clr(${JIT_BASE_NAME}_static STATIC ${SHARED_LIB_SOURCES} ) - add_dependencies(ClrJit coreclrpal gcinfo) + add_dependencies(${JIT_BASE_NAME}_static coreclrpal gcinfo) else() - add_library_clr(ClrJit + add_library_clr(${JIT_BASE_NAME}_static ${SOURCES} ) # Disable up to here (see above) the following for UNIX altjit on Windows diff --git a/src/jit/standalone/CMakeLists.txt b/src/jit/standalone/CMakeLists.txt index 54a5e54916..c98dab5d28 100644 --- a/src/jit/standalone/CMakeLists.txt +++ b/src/jit/standalone/CMakeLists.txt @@ -9,7 +9,7 @@ if(CLR_CMAKE_PLATFORM_LINUX OR CLR_CMAKE_PLATFORM_NETBSD) set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Xlinker -Bsymbolic -Bsymbolic-functions") endif(CLR_CMAKE_PLATFORM_LINUX OR CLR_CMAKE_PLATFORM_NETBSD) -add_library_clr(ryujit +add_library_clr(${JIT_BASE_NAME} SHARED ${SHARED_LIB_SOURCES} ) @@ -43,9 +43,9 @@ else() ) endif(CLR_CMAKE_PLATFORM_UNIX) -target_link_libraries(ryujit +target_link_libraries(${JIT_BASE_NAME} ${RYUJIT_LINK_LIBRARIES} ) # add the install targets -install_clr(ryujit)
\ No newline at end of file +install_clr(${JIT_BASE_NAME}) |