diff options
author | Mike McLaughlin <mikem@microsoft.com> | 2016-03-22 14:28:18 -0700 |
---|---|---|
committer | Mike McLaughlin <mikem@microsoft.com> | 2016-03-22 14:28:18 -0700 |
commit | cfe34e6d0ed068caab9c4ee370549e86db4ee2bd (patch) | |
tree | cfc60ded18c454e47ccca85f34383a4d7b0edfd2 /src | |
parent | 672176b73de7bea8bf66457152ae0c19f156cb56 (diff) | |
parent | 4efef62f0ead16b4f8ca2c6ccf0a77ce112f73b9 (diff) | |
download | coreclr-cfe34e6d0ed068caab9c4ee370549e86db4ee2bd.tar.gz coreclr-cfe34e6d0ed068caab9c4ee370549e86db4ee2bd.tar.bz2 coreclr-cfe34e6d0ed068caab9c4ee370549e86db4ee2bd.zip |
Merge pull request #3794 from mikem8361/stripsym
Strip symbols on release builds into separate binaries
Diffstat (limited to 'src')
-rw-r--r-- | src/ToolBox/SOS/Strike/CMakeLists.txt | 11 | ||||
-rw-r--r-- | src/ToolBox/SOS/lldbplugin/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/coreclr/hosts/coreconsole/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/coreclr/hosts/corerun/CMakeLists.txt | 6 | ||||
-rw-r--r-- | src/coreclr/hosts/osxbundlerun/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/coreclr/hosts/unixcoreconsole/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/coreclr/hosts/unixcorerun/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/corefx/System.Globalization.Native/CMakeLists.txt | 3 | ||||
-rw-r--r-- | src/dlls/clretwrc/CMakeLists.txt | 6 | ||||
-rw-r--r-- | src/dlls/dbgshim/CMakeLists.txt | 5 | ||||
-rw-r--r-- | src/dlls/mscordac/CMakeLists.txt | 5 | ||||
-rw-r--r-- | src/dlls/mscordbi/CMakeLists.txt | 5 | ||||
-rw-r--r-- | src/dlls/mscoree/coreclr/CMakeLists.txt | 8 | ||||
-rw-r--r-- | src/ilasm/CMakeLists.txt | 5 | ||||
-rw-r--r-- | src/ildasm/exe/CMakeLists.txt | 6 | ||||
-rw-r--r-- | src/jit/standalone/CMakeLists.txt | 5 | ||||
-rw-r--r-- | src/scripts/genXplatLttng.py | 8 | ||||
-rw-r--r-- | src/tools/crossgen/CMakeLists.txt | 9 |
18 files changed, 30 insertions, 64 deletions
diff --git a/src/ToolBox/SOS/Strike/CMakeLists.txt b/src/ToolBox/SOS/Strike/CMakeLists.txt index f4b157b2c7..77d929d69b 100644 --- a/src/ToolBox/SOS/Strike/CMakeLists.txt +++ b/src/ToolBox/SOS/Strike/CMakeLists.txt @@ -146,9 +146,8 @@ add_dependencies(sos mscordaccore) target_link_libraries(sos ${SOS_LIBRARY}) # add the install targets -install (TARGETS sos DESTINATION .) -if(WIN32) - install (FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/sos.pdb DESTINATION PDB) -else(WIN32) - install (FILES sosdocsunix.txt DESTINATION .) -endif(WIN32) +install_clr(sos) + +if(NOT WIN32) + install(FILES sosdocsunix.txt DESTINATION .) +endif(NOT WIN32) diff --git a/src/ToolBox/SOS/lldbplugin/CMakeLists.txt b/src/ToolBox/SOS/lldbplugin/CMakeLists.txt index 90fbcbd4e1..438ae33478 100644 --- a/src/ToolBox/SOS/lldbplugin/CMakeLists.txt +++ b/src/ToolBox/SOS/lldbplugin/CMakeLists.txt @@ -93,4 +93,4 @@ if (CLR_CMAKE_PLATFORM_UNIX) endif() # add the install targets -install (TARGETS sosplugin DESTINATION .) +install_clr(sosplugin)
\ No newline at end of file diff --git a/src/coreclr/hosts/coreconsole/CMakeLists.txt b/src/coreclr/hosts/coreconsole/CMakeLists.txt index 8848ff7d1a..634fdb77d6 100644 --- a/src/coreclr/hosts/coreconsole/CMakeLists.txt +++ b/src/coreclr/hosts/coreconsole/CMakeLists.txt @@ -27,8 +27,6 @@ else() ) # Can't compile on linux yet so only add for windows - # add the install targets - install (TARGETS CoreConsole DESTINATION .) - install (FILES ${CMAKE_CURRENT_BINARY_DIR}/$ENV{__BuildType}/CoreConsole.pdb DESTINATION PDB) + install_clr(CoreConsole) endif(CLR_CMAKE_PLATFORM_UNIX)
\ No newline at end of file diff --git a/src/coreclr/hosts/corerun/CMakeLists.txt b/src/coreclr/hosts/corerun/CMakeLists.txt index 3a992ebcf5..7b25c12d6b 100644 --- a/src/coreclr/hosts/corerun/CMakeLists.txt +++ b/src/coreclr/hosts/corerun/CMakeLists.txt @@ -32,10 +32,6 @@ else() ) # Can't compile on linux yet so only add for windows - # add the install targets - install (TARGETS CoreRun DESTINATION .) + install_clr(CoreRun) - # We will generate PDB only for the debug configuration - install (FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/CoreRun.pdb DESTINATION PDB) - endif(CLR_CMAKE_PLATFORM_UNIX)
\ No newline at end of file diff --git a/src/coreclr/hosts/osxbundlerun/CMakeLists.txt b/src/coreclr/hosts/osxbundlerun/CMakeLists.txt index 9c8fd7a275..2ccc881dbe 100644 --- a/src/coreclr/hosts/osxbundlerun/CMakeLists.txt +++ b/src/coreclr/hosts/osxbundlerun/CMakeLists.txt @@ -21,4 +21,4 @@ add_dependencies(osxbundlerun coreclr ) -install (TARGETS osxbundlerun DESTINATION .) +install_clr(osxbundlerun) diff --git a/src/coreclr/hosts/unixcoreconsole/CMakeLists.txt b/src/coreclr/hosts/unixcoreconsole/CMakeLists.txt index f4840edf38..cb18e82776 100644 --- a/src/coreclr/hosts/unixcoreconsole/CMakeLists.txt +++ b/src/coreclr/hosts/unixcoreconsole/CMakeLists.txt @@ -30,4 +30,4 @@ add_dependencies(coreconsole coreclr ) -install (TARGETS coreconsole DESTINATION .) +install_clr(coreconsole)
\ No newline at end of file diff --git a/src/coreclr/hosts/unixcorerun/CMakeLists.txt b/src/coreclr/hosts/unixcorerun/CMakeLists.txt index 4563ba9938..1f0c75995e 100644 --- a/src/coreclr/hosts/unixcorerun/CMakeLists.txt +++ b/src/coreclr/hosts/unixcorerun/CMakeLists.txt @@ -30,4 +30,4 @@ add_dependencies(corerun coreclr ) -install (TARGETS corerun DESTINATION .) +install_clr(corerun)
\ No newline at end of file diff --git a/src/corefx/System.Globalization.Native/CMakeLists.txt b/src/corefx/System.Globalization.Native/CMakeLists.txt index 879dc5bc18..bf279efe6a 100644 --- a/src/corefx/System.Globalization.Native/CMakeLists.txt +++ b/src/corefx/System.Globalization.Native/CMakeLists.txt @@ -73,4 +73,5 @@ else() add_definitions(-DU_DISABLE_RENAMING=1) endif() -install (TARGETS System.Globalization.Native DESTINATION .) +# add the install targets +install_clr(System.Globalization.Native)
\ No newline at end of file diff --git a/src/dlls/clretwrc/CMakeLists.txt b/src/dlls/clretwrc/CMakeLists.txt index 36205b5fe1..b1f7a49088 100644 --- a/src/dlls/clretwrc/CMakeLists.txt +++ b/src/dlls/clretwrc/CMakeLists.txt @@ -20,8 +20,4 @@ add_library_clr(clretwrc SHARED ) # add the install targets -install (TARGETS clretwrc DESTINATION .) - -if(WIN32) - install (FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/clretwrc.pdb DESTINATION PDB) -endif(WIN32) +install_clr(clretwrc)
\ No newline at end of file diff --git a/src/dlls/dbgshim/CMakeLists.txt b/src/dlls/dbgshim/CMakeLists.txt index 655cb0a28b..c3ebaf5d06 100644 --- a/src/dlls/dbgshim/CMakeLists.txt +++ b/src/dlls/dbgshim/CMakeLists.txt @@ -71,7 +71,4 @@ endif(WIN32) target_link_libraries(dbgshim ${DBGSHIM_LIBRARIES}) # add the install targets -install (TARGETS dbgshim DESTINATION .) -if(WIN32) - install (FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/dbgshim.pdb DESTINATION PDB) -endif(WIN32) +install_clr(dbgshim) diff --git a/src/dlls/mscordac/CMakeLists.txt b/src/dlls/mscordac/CMakeLists.txt index ea655e77b8..9a28479fed 100644 --- a/src/dlls/mscordac/CMakeLists.txt +++ b/src/dlls/mscordac/CMakeLists.txt @@ -106,7 +106,4 @@ endif(WIN32) target_link_libraries(mscordaccore ${COREDAC_LIBRARIES}) # add the install targets -install (TARGETS mscordaccore DESTINATION .) -if(WIN32) - install (FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/mscordaccore.pdb DESTINATION PDB) -endif(WIN32) +install_clr(mscordaccore)
\ No newline at end of file diff --git a/src/dlls/mscordbi/CMakeLists.txt b/src/dlls/mscordbi/CMakeLists.txt index 0c8a685b76..2748bdf4a2 100644 --- a/src/dlls/mscordbi/CMakeLists.txt +++ b/src/dlls/mscordbi/CMakeLists.txt @@ -95,7 +95,4 @@ elseif(CLR_CMAKE_PLATFORM_UNIX) endif(WIN32) # add the install targets -install (TARGETS mscordbi DESTINATION .) -if(WIN32) - install (FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/mscordbi.pdb DESTINATION PDB) -endif(WIN32) +install_clr(mscordbi)
\ No newline at end of file diff --git a/src/dlls/mscoree/coreclr/CMakeLists.txt b/src/dlls/mscoree/coreclr/CMakeLists.txt index 2c57fb630e..78ec166065 100644 --- a/src/dlls/mscoree/coreclr/CMakeLists.txt +++ b/src/dlls/mscoree/coreclr/CMakeLists.txt @@ -140,7 +140,8 @@ if(WIN32) clr_unknown_arch() endif() - add_custom_command(TARGET coreclr + add_custom_command( + TARGET coreclr POST_BUILD COMMAND ${CMAKE_CXX_COMPILER} /P /EP /TP ${PREPROCESS_DEFINITIONS} ${INC_DIR} /Fi${CMAKE_CURRENT_BINARY_DIR}/daccess.i ${CLR_DIR}/src/debug/daccess/daccess.cpp COMMAND ${BuildToolsDir}/dactablegen.exe /dac:${CMAKE_CURRENT_BINARY_DIR}/daccess.i /pdb:${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/coreclr.pdb /dll:$<TARGET_FILE:coreclr> /bin:${CMAKE_CURRENT_BINARY_DIR}/wks.bin @@ -160,7 +161,4 @@ else() endif(WIN32) # add the install targets -install (TARGETS coreclr DESTINATION .) -if(WIN32) - install (FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/coreclr.pdb DESTINATION PDB) -endif(WIN32) +install_clr(coreclr)
\ No newline at end of file diff --git a/src/ilasm/CMakeLists.txt b/src/ilasm/CMakeLists.txt index 4c5a7f63a9..e6828e7a49 100644 --- a/src/ilasm/CMakeLists.txt +++ b/src/ilasm/CMakeLists.txt @@ -66,7 +66,6 @@ if(CLR_CMAKE_PLATFORM_UNIX) dl ) endif(NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD AND NOT CMAKE_SYSTEM_NAME STREQUAL NetBSD) - else() target_link_libraries(ilasm ${ILASM_LINK_LIBRARIES} @@ -76,8 +75,6 @@ else() oleaut32 shell32 ) - - install (FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/ilasm.pdb DESTINATION PDB) endif(CLR_CMAKE_PLATFORM_UNIX) -install (TARGETS ilasm DESTINATION .) +install_clr(ilasm)
\ No newline at end of file diff --git a/src/ildasm/exe/CMakeLists.txt b/src/ildasm/exe/CMakeLists.txt index 8a57044ce6..8b468f07a4 100644 --- a/src/ildasm/exe/CMakeLists.txt +++ b/src/ildasm/exe/CMakeLists.txt @@ -69,10 +69,6 @@ else() oleaut32 shell32 ) - - # We will generate PDB only for the debug configuration - install (FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/ildasm.pdb DESTINATION PDB) - endif(CLR_CMAKE_PLATFORM_UNIX) -install (TARGETS ildasm DESTINATION .) +install_clr(ildasm)
\ No newline at end of file diff --git a/src/jit/standalone/CMakeLists.txt b/src/jit/standalone/CMakeLists.txt index ba987b409b..80e9a0e8e9 100644 --- a/src/jit/standalone/CMakeLists.txt +++ b/src/jit/standalone/CMakeLists.txt @@ -47,7 +47,4 @@ target_link_libraries(ryujit ) # add the install targets -install (TARGETS ryujit DESTINATION .) -if(WIN32) - install (FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/ryujit.pdb DESTINATION PDB) -endif(WIN32) +install_clr(ryujit)
\ No newline at end of file diff --git a/src/scripts/genXplatLttng.py b/src/scripts/genXplatLttng.py index 7befa6136e..d343b122ff 100644 --- a/src/scripts/genXplatLttng.py +++ b/src/scripts/genXplatLttng.py @@ -444,7 +444,7 @@ def generateLttngFiles(etwmanifest,eventprovider_directory): add_subdirectory(tracepointprovider) # Install the static eventprovider library - install (TARGETS eventprovider DESTINATION lib) + install(TARGETS eventprovider DESTINATION lib) """) topCmake.close() @@ -481,11 +481,11 @@ def generateLttngFiles(etwmanifest,eventprovider_directory): tracepointprovider_Cmake.write(""" ) target_link_libraries(coreclrtraceptprovider - -llttng-ust + -llttng-ust ) - #Install the static coreclrtraceptprovider library - install (TARGETS coreclrtraceptprovider DESTINATION .) + # Install the static coreclrtraceptprovider library + install_clr(coreclrtraceptprovider) """) tracepointprovider_Cmake.close() diff --git a/src/tools/crossgen/CMakeLists.txt b/src/tools/crossgen/CMakeLists.txt index 9bbf37334a..d5e956620f 100644 --- a/src/tools/crossgen/CMakeLists.txt +++ b/src/tools/crossgen/CMakeLists.txt @@ -64,14 +64,11 @@ else() if (NOT CLR_CMAKE_PLATFORM_ARCH_ARM64) target_link_libraries(crossgen ${STATIC_MT_VCRT_LIB}) endif() - - # We will generate PDB only for the debug configuration - install (FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/crossgen.pdb DESTINATION PDB) - endif(CLR_CMAKE_PLATFORM_UNIX) -install (TARGETS crossgen DESTINATION .) - add_subdirectory(../../zap/crossgen ../../zap/crossgen) add_subdirectory(../../vm/crossgen ../../vm/crossgen) add_subdirectory(../../vm/crossgen_mscorlib ../../vm/crossgen_mscorlib) + +# add the install targets +install_clr(crossgen)
\ No newline at end of file |