Skip to content

Commit

Permalink
Windows debug flags were failing on Linux. These expressions can be t…
Browse files Browse the repository at this point in the history
…ricky - make another try, but don't know if this works correctly on MSVC
  • Loading branch information
starseeker committed Mar 27, 2024
1 parent 3344175 commit b30bd9f
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions llvm/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ if (ENABLE_LLVM)
set(Z_BRL_PATCH_CMD "${PATCH_CMD};${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/llvm_z_brl.patch")
set(PATCH_CMD "COMMAND")
endif (TARGET ZLIB_BLD)
set(IS_MSVC 0)
if (MSVC)
set(IS_MSVC 1)
set(Z_NO_AST_INTRO_PATCH_CMD "${PATCH_CMD};${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/llvm_no_ast_introspection.patch")
set(PATCH_CMD "COMMAND")
endif (MSVC)
Expand Down Expand Up @@ -74,8 +76,8 @@ if (ENABLE_LLVM)
-DCMAKE_INSTALL_LIBDIR:PATH=${LIB_DIR}
-DCMAKE_INSTALL_RPATH=${CMAKE_BUNDLE_INSTALL_PREFIX}/${LIB_DIR}
# we don't need LLVM itself to be debuggable. Prevents .pdb and .ilk bloat.
-DCMAKE_CXX_FLAGS_DEBUG="$<$<CONFIG:Debug>:/DEBUG:NONE>"
-DCMAKE_EXE_LINKER_FLAGS_DEBUG="$<$<CONFIG:Debug>:/DEBUG:NONE /INCREMENTAL:NO>"
$<AND:${IS_MSVC},$<CONFIG:Debug>:-DCMAKE_CXX_FLAGS_DEBUG=/DEBUG:NONE>
$<AND:${IS_MSVC},$<CONFIG:Debug>:-DCMAKE_EXE_LINKER_FLAGS_DEBUG=/DEBUG:NONE /INCREMENTAL:NO>
LOG_CONFIGURE ${EXT_BUILD_QUIET}
LOG_BUILD ${EXT_BUILD_QUIET}
LOG_INSTALL ${EXT_BUILD_QUIET}
Expand Down

0 comments on commit b30bd9f

Please sign in to comment.