diff options
| author | Sergiy Kuryata <sergeyk@microsoft.com> | 2015-02-04 13:59:44 -0800 |
|---|---|---|
| committer | Sergiy Kuryata <sergeyk@microsoft.com> | 2015-02-04 13:59:44 -0800 |
| commit | cf0508a1bbfb8966c397d271320266c1d9ba0345 (patch) | |
| tree | ba8bef4f49a73dae497b674a507d413b209677f0 /src | |
| parent | cbf5cbf6c257bc7766185b813a5d50078defcb74 (diff) | |
| download | coreclr-cf0508a1bbfb8966c397d271320266c1d9ba0345.tar.gz coreclr-cf0508a1bbfb8966c397d271320266c1d9ba0345.tar.bz2 coreclr-cf0508a1bbfb8966c397d271320266c1d9ba0345.zip | |
Enable binplacing of native CoreCLR binaries on Linux
This change adds support for binplacing native CoreCLR binaries on Linux to "$__RootBinDir/Product/$__BuildArch/$__BuildType". It reuses the mechanism that we currently have in place for Windows. Similarly to binplace implementation for Windows, it sets an environment variable (__CMakeBinDir) in build.sh and then uses its value in clang-compiler-override.txt to set CMAKE_INSTALL_PREFIX to the desired target location.
Diffstat (limited to 'src')
| -rw-r--r-- | src/coreclr/hosts/unixcorerun/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/dlls/mscordac/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/dlls/mscoree/coreclr/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/pal/tools/clang-compiler-override.txt | 1 |
4 files changed, 9 insertions, 2 deletions
diff --git a/src/coreclr/hosts/unixcorerun/CMakeLists.txt b/src/coreclr/hosts/unixcorerun/CMakeLists.txt index a9ad723eb5..47b15dc510 100644 --- a/src/coreclr/hosts/unixcorerun/CMakeLists.txt +++ b/src/coreclr/hosts/unixcorerun/CMakeLists.txt @@ -15,3 +15,5 @@ target_link_libraries(corerun add_dependencies(corerun coreclr ) + +install (TARGETS corerun DESTINATION .) diff --git a/src/dlls/mscordac/CMakeLists.txt b/src/dlls/mscordac/CMakeLists.txt index 527cf341b5..4e012058fb 100644 --- a/src/dlls/mscordac/CMakeLists.txt +++ b/src/dlls/mscordac/CMakeLists.txt @@ -75,4 +75,6 @@ target_link_libraries(mscordaccore ${COREDAC_LIBRARIES}) # add the install targets install (TARGETS mscordaccore DESTINATION .) -install (FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/mscordaccore.pdb DESTINATION PDB)
\ No newline at end of file +if(WIN32) + install (FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/mscordaccore.pdb DESTINATION PDB) +endif(WIN32) diff --git a/src/dlls/mscoree/coreclr/CMakeLists.txt b/src/dlls/mscoree/coreclr/CMakeLists.txt index ba983ce86e..d17df90ffb 100644 --- a/src/dlls/mscoree/coreclr/CMakeLists.txt +++ b/src/dlls/mscoree/coreclr/CMakeLists.txt @@ -106,5 +106,7 @@ endif(WIN32) # add the install targets install (TARGETS coreclr DESTINATION .) -install (FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/coreclr.pdb DESTINATION PDB) +if(WIN32) + install (FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/coreclr.pdb DESTINATION PDB) +endif(WIN32) diff --git a/src/pal/tools/clang-compiler-override.txt b/src/pal/tools/clang-compiler-override.txt index 52a53efaa2..7d99902be5 100644 --- a/src/pal/tools/clang-compiler-override.txt +++ b/src/pal/tools/clang-compiler-override.txt @@ -12,3 +12,4 @@ SET (CLR_DEFINES_DEBUG_INIT DEBUG _DEBUG _DBG URTBLDENV_FRIENDLY=Ch SET (CLR_DEFINES_RELEASE_INIT NDEBUG URTBLDENV_FRIENDLY=Retail) SET (CLR_DEFINES_RELWITHDEBINFO_INIT NDEBUG URTBLDENV_FRIENDLY=Retail) +SET (CMAKE_INSTALL_PREFIX $ENV{__CMakeBinDir}) |