Merge branch 'master' into merge-2.061-2

This commit is contained in:
kai
2013-01-26 17:40:24 +01:00
2 changed files with 15 additions and 4 deletions

View File

@@ -316,10 +316,12 @@ macro(build_runtime d_flags c_flags ld_flags lib_suffix path_suffix outlist_targ
dc(${f} "${d_flags}" "${RUNTIME_DIR}" "${target_suffix}" DCRT_O DCRT_BC)
endforeach()
# Always build zlib and other C parts of the runtime in release mode.
set_source_files_properties(${CORE_C} ${DCRT_C} PROPERTIES
COMPILE_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_RELEASE}"
)
if(NOT MSVC)
# Always build zlib and other C parts of the runtime in release mode.
set_source_files_properties(${CORE_C} ${DCRT_C} PROPERTIES
COMPILE_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_RELEASE}"
)
endif()
if(EXISTS ${RUNTIME_DIR})
set(GCCBUILTINS "${PROJECT_BINARY_DIR}/gccbuiltins_x86.di")