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