Skip to content

Commit

Permalink
Merge pull request #9696 from dnakamura/base_warnings2
Browse files Browse the repository at this point in the history
CMake: Reintroduce base warning flags
  • Loading branch information
keithc-ca committed May 27, 2020
2 parents 4e2d333 + 8c481d6 commit f8a2c93
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
1 change: 1 addition & 0 deletions runtime/cmake/platform/toolcfg/gnu.cmake
Expand Up @@ -21,6 +21,7 @@
################################################################################

list(APPEND OMR_PLATFORM_COMPILE_OPTIONS -O3 -g -fstack-protector)
list(APPEND OMR_PLATFORM_C_COMPILE_OPTIONS -Wimplicit -Wreturn-type)
list(APPEND OMR_PLATFORM_CXX_COMPILE_OPTIONS -fno-threadsafe-statics)

# OMR_PLATFORM_CXX_COMPILE_OPTIONS gets applied to the jit (which needs exceptions),
Expand Down
10 changes: 3 additions & 7 deletions runtime/compiler/CMakeLists.txt
Expand Up @@ -81,12 +81,7 @@ add_custom_target(j9jit_tracegen DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/env/ut_j9ji

# J9VM_OPT_JITSERVER
if(J9VM_OPT_JITSERVER)
message(STATUS "JITServer is supported")

if(OPENSSL_CFLAGS)
set(J9_CFLAGS "${J9_CFLAGS} ${OPENSSL_CFLAGS}")
set(J9_CXXFLAGS "${J9_CXXFLAGS} ${OPENSSL_CFLAGS}")
endif()
message(STATUS "JITServer is enabled")

if(OPENSSL_BUNDLE_LIB_PATH) # --enable-openssl-bundling
set(OPENSSL_ROOT_DIR ${OPENSSL_BUNDLE_LIB_PATH})
Expand All @@ -95,7 +90,6 @@ if(J9VM_OPT_JITSERVER)
set(OPENSSL_ROOT_DIR ${OPENSSL_DIR})
endif()

include(FindOpenSSL)
find_package(OpenSSL REQUIRED)
include_directories(${OPENSSL_INCLUDE_DIR})
endif()
Expand Down Expand Up @@ -225,6 +219,8 @@ set(J9_INCLUDES
# Makefiles
set(J9_SHAREDFLAGS
${OMR_PLATFORM_COMPILE_OPTIONS}
)
set(J9_CFLAGS
${OMR_PLATFORM_C_COMPILE_OPTIONS}
)
set(J9_CXXFLAGS
Expand Down

0 comments on commit f8a2c93

Please sign in to comment.