--- dyninst-10.1.0/testsuite-10.1.0/CMakeLists.txt +++ dyninst-10.1.0/testsuite-10.1.0/CMakeLists.txt @@ -335,1 +335,2 @@ - find_program(M_gnu_cc NAMES gcc) + # Force mutator to use devtoolset-10-gcc + find_program(M_gnu_cc NAMES gcc PATHS /opt/rh/devtoolset-10/root/usr/bin NO_DEFAULT_PATH) @@ -337,1 +338,2 @@ - find_program(M_gnu_cxx NAMES g++) + # Force mutator to use devtoolset-10-gxx + find_program(M_gnu_cxx NAMES g++ PATHS /opt/rh/devtoolset-10/root/usr/bin NO_DEFAULT_PATH) --- dyninst-10.1.0/testsuite-10.1.0/checkMutateeCompiler.cmake +++ dyninst-10.1.0/testsuite-10.1.0/checkMutateeCompiler.cmake @@ -5,10 +5,11 @@ MACRO (CHECK_MUTATEE_COMPILER _COMPILER _COMP_FLAG _LINK_FLAG _LANG _MSG _RESULT set(COMPILER_OUTPUT "") file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/CMakeTmp/CompilerTest) if(${_LANG} MATCHES CXX) + message ("CHECK_MUTATEE_COMPILER " ${CMAKE_BINARY_DIR}/CMakeTmp/CompilerTest " " ${CMAKE_COMMAND} " " -DCMAKE_CXX_COMPILER=${_COMPILER} " " -DCMAKE_CXX_FLAGS="${_COMP_FLAG}" " " -DCMAKE_EXE_LINKER_FLAGS="${_LINK_FLAG}" " " -G"${CMAKE_GENERATOR}" " " ${PROJECT_SOURCE_DIR}/compiler_test/cxx) execute_process(WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/CMakeTmp/CompilerTest RESULT_VARIABLE COMPILER_RESULT - OUTPUT_QUIET - ERROR_QUIET +# OUTPUT_QUIET +# ERROR_QUIET # OUTPUT_VARIABLE COMPILER_OUTPUT # ERROR_VARIABLE COMPILER_OUTPUT COMMAND ${CMAKE_COMMAND} @@ -31,10 +32,11 @@ MACRO (CHECK_MUTATEE_COMPILER _COMPILER _COMP_FLAG _LINK_FLAG _LANG _MSG _RESULT -G${CMAKE_GENERATOR} ${PROJECT_SOURCE_DIR}/compiler_test/fortran) elseif (${_LANG} MATCHES C) + message ("CHECK_MUTATEE_COMPILER " ${CMAKE_BINARY_DIR}/CMakeTmp/CompilerTest " " ${CMAKE_COMMAND} " " -DCMAKE_C_COMPILER=${_COMPILER} " " -DCMAKE_C_FLAGS="${_COMP_FLAG}" " " -DCMAKE_EXE_LINKER_FLAGS="${_LINK_FLAG}" " " -G"${CMAKE_GENERATOR}" " " ${PROJECT_SOURCE_DIR}/compiler_test/c) execute_process(WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/CMakeTmp/CompilerTest RESULT_VARIABLE COMPILER_RESULT - OUTPUT_QUIET - ERROR_QUIET +# OUTPUT_QUIET +# ERROR_QUIET # OUTPUT_VARIABLE COMPILER_OUTPUT # ERROR_VARIABLE COMPILER_OUTPUT COMMAND ${CMAKE_COMMAND}