diff --git a/CMakeLists.txt b/CMakeLists.txt
index c8836dc63..f04946002 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,7 +36,8 @@ ENDIF(CMAKE_SYSTEM MATCHES "AIX.*")
 
 IF(CMAKE_SYSTEM MATCHES "IRIX.*")
   IF(NOT CMAKE_COMPILER_IS_GNUCXX)
-    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -LD_MSG:off=15 ")
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-woff84 -no_auto_include")
+    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-woff15")
   ENDIF(NOT CMAKE_COMPILER_IS_GNUCXX)
 ENDIF(CMAKE_SYSTEM MATCHES "IRIX.*")
 
diff --git a/Source/CTest/CMakeLists.txt b/Source/CTest/CMakeLists.txt
index 6514ff98b..e969dc8f8 100644
--- a/Source/CTest/CMakeLists.txt
+++ b/Source/CTest/CMakeLists.txt
@@ -8,6 +8,7 @@ IF(CMAKE_SYSTEM MATCHES "AIX.*")
   ENDIF(NOT CMAKE_COMPILER_IS_GNUCXX)
 ENDIF(CMAKE_SYSTEM MATCHES "AIX.*")
 
+SET(HAVE_LIBCRYPTO 0 CACHE INTERNAL)
 
 IF(CMAKE_BUILD_WITH_CURL)
   SET(CMAKE_LIBRARY CMakeLib)