Skip to content

Commit f3cd8d7

Browse files
committed
Bug #18306484 PACKAGE GCC SOURCE TARBALL IF PRESENT IN THE SOURCE TREE
Conditionally install the file Only needed for Solaris ATM but no need to make the cmake code conditional on Solaris; PB2 will take care of knowing when to inject it into the src
1 parent ae5f59f commit f3cd8d7

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

cmake/cpack_source_ignore_files.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ CPackConfig.cmake
2828
/_CPack_Packages/
2929
$\\\\.gz
3030
$\\\\.zip
31+
$\\\\.bz2
3132
/CMakeFiles/
3233
/version_resources/
3334
/_CPack_Packages/

extra/CMakeLists.txt

+6
Original file line numberDiff line numberDiff line change
@@ -113,3 +113,9 @@ IF(UNIX)
113113
SET_TARGET_PROPERTIES(mysql_waitpid PROPERTIES LINKER_LANGUAGE CXX)
114114
ENDIF()
115115

116+
# In published release builds on Solaris, we need to bundle gcc source.
117+
# PB2 will take care of putting it in extra/ when needed
118+
IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/gcc-4.8.1.tar.bz2)
119+
INSTALL(FILES gcc-4.8.1.tar.bz2
120+
DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Development)
121+
ENDIF()

0 commit comments

Comments
 (0)