Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Enable binplacing of native CoreCLR binaries on Linux #80

Merged
merged 1 commit into from
Feb 5, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ build_coreclr()
{
# All set to commence the build

echo Commencing build of native components for %__BuildArch%/%__BuildType%
echo Commencing build of native components for $__BuildArch/$__BuildType
cd $__CMakeSlnDir

# Regenerate the CMake solution
Expand All @@ -81,7 +81,7 @@ build_coreclr()
# Build CoreCLR

echo Executing make $__UnprocessedBuildArgs
make -j `nproc` $__UnprocessedBuildArgs
make install -j `nproc` $__UnprocessedBuildArgs
if [ $? != 0 ]; then
echo Failed to build coreclr components.
exit 1
Expand Down Expand Up @@ -148,6 +148,10 @@ __ToolsDir="$__RootBinDir/tools"
__TestWorkingDir="$__RootBinDir/tests/$__BuildArch/$__BuildType"
__IntermediatesDir="$__RootBinDir/intermediates/$__BuildArch/$__BuildType"

# Specify path to be set for CMAKE_INSTALL_PREFIX.
# This is where all built CoreClr libraries will copied to.
export __CMakeBinDir="$__BinDir"

# Switch to clean build mode if the binaries output folder does not exist
if [ ! -d "$__RootBinDir" ]; then
__CleanBuild=1
Expand Down
2 changes: 2 additions & 0 deletions src/coreclr/hosts/unixcorerun/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ target_link_libraries(corerun
add_dependencies(corerun
coreclr
)

install (TARGETS corerun DESTINATION .)
4 changes: 3 additions & 1 deletion src/dlls/mscordac/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
if(WIN32)
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/mscordaccore.pdb DESTINATION PDB)
endif(WIN32)
4 changes: 3 additions & 1 deletion src/dlls/mscoree/coreclr/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

1 change: 1 addition & 0 deletions src/pal/tools/clang-compiler-override.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})