diff --git a/MultiSource/Applications/ALAC/CMakeLists.txt b/MultiSource/Applications/ALAC/CMakeLists.txt
index 9c302e3192..cec8a867d3 100644
--- a/MultiSource/Applications/ALAC/CMakeLists.txt
+++ b/MultiSource/Applications/ALAC/CMakeLists.txt
@@ -1,2 +1,2 @@
-add_subdirectory(encode)
-add_subdirectory(decode)
+#add_subdirectory(encode)
+#add_subdirectory(decode)
diff --git a/MultiSource/Applications/CMakeLists.txt b/MultiSource/Applications/CMakeLists.txt
index b008394f1b..e60c637328 100644
--- a/MultiSource/Applications/CMakeLists.txt
+++ b/MultiSource/Applications/CMakeLists.txt
@@ -10,16 +10,16 @@ if(NOT ARCH STREQUAL "PowerPC")
 # be restored when the issue is corrected.
   add_subdirectory(oggenc)
 endif()
-add_subdirectory(sgefa)
-add_subdirectory(spiff)
+#add_subdirectory(sgefa)
+#add_subdirectory(spiff)
 add_subdirectory(viterbi)
 
 add_subdirectory(ALAC)
-add_subdirectory(hbd)
-add_subdirectory(lambda-0.1.3)
-add_subdirectory(minisat)
+#add_subdirectory(hbd)
+#add_subdirectory(lambda-0.1.3)
+#add_subdirectory(minisat)
 if(NOT TARGET_OS STREQUAL "SunOS")
-  add_subdirectory(hexxagon)
+  #add_subdirectory(hexxagon)
 endif()
 if(NOT DEFINED SMALL_PROBLEM_SIZE)
   add_subdirectory(lua)
@@ -28,7 +28,7 @@ if((TARGET_OS STREQUAL "Linux" OR TARGET_OS STREQUAL "Darwin") AND (NOT ARCH STR
   add_subdirectory(obsequi)
 endif()
 if(NOT TARGET_OS STREQUAL "SunOS")
-  add_subdirectory(kimwitu++)
+  #add_subdirectory(kimwitu++)
 endif()
 if(NOT TARGET_OS STREQUAL "SunOS")
   add_subdirectory(SPASS)
diff --git a/MultiSource/Applications/JM/CMakeLists.txt b/MultiSource/Applications/JM/CMakeLists.txt
index 2a0be7f2da..5802db9bcc 100644
--- a/MultiSource/Applications/JM/CMakeLists.txt
+++ b/MultiSource/Applications/JM/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_subdirectory(ldecod)
-add_subdirectory(lencod)
+#add_subdirectory(lencod)
diff --git a/MultiSource/Benchmarks/CMakeLists.txt b/MultiSource/Benchmarks/CMakeLists.txt
index 61d1fd080f..2879b6628a 100644
--- a/MultiSource/Benchmarks/CMakeLists.txt
+++ b/MultiSource/Benchmarks/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_subdirectory(ASCI_Purple)
 add_subdirectory(ASC_Sequoia)
 add_subdirectory(BitBench)
-add_subdirectory(Fhourstones)
+#add_subdirectory(Fhourstones)
 add_subdirectory(Fhourstones-3.1)
 add_subdirectory(FreeBench)
 add_subdirectory(MallocBench)
@@ -23,16 +23,16 @@ if((NOT "${TARGET_OS}" STREQUAL "Darwin") OR (NOT "${ARCH}" STREQUAL "ARM"))
   add_subdirectory(TSVC)
 endif()
 add_subdirectory(Prolangs-C++)
-add_subdirectory(Bullet)
-add_subdirectory(tramp3d-v4)
+#add_subdirectory(Bullet)
+#add_subdirectory(tramp3d-v4)
 if(NOT "${ARCH}" STREQUAL "Hexagon")
   add_subdirectory(DOE-ProxyApps-C++)
   add_subdirectory(DOE-ProxyApps-C)
   add_subdirectory(MiBench)
 endif()
 if(NOT "${ARCH}" STREQUAL "XCore")
-  add_subdirectory(7zip)
-  add_subdirectory(PAQ8p)
+  #add_subdirectory(7zip)
+  #add_subdirectory(PAQ8p)
 endif()
 if(NOT DEFINED SMALL_PROBLEM_SIZE)
   add_subdirectory(mafft)
diff --git a/MultiSource/Benchmarks/DOE-ProxyApps-C++/CMakeLists.txt b/MultiSource/Benchmarks/DOE-ProxyApps-C++/CMakeLists.txt
index 992808049b..233778368a 100644
--- a/MultiSource/Benchmarks/DOE-ProxyApps-C++/CMakeLists.txt
+++ b/MultiSource/Benchmarks/DOE-ProxyApps-C++/CMakeLists.txt
@@ -1,7 +1,7 @@
-add_subdirectory(HPCCG)
-add_subdirectory(PENNANT)
-add_subdirectory(miniFE)
+#add_subdirectory(HPCCG)
+#add_subdirectory(PENNANT)
+#add_subdirectory(miniFE)
 if(NOT CMAKE_SYSTEM_NAME MATCHES "AIX")
-add_subdirectory(CLAMR)
+#add_subdirectory(CLAMR)
 endif()
-add_subdirectory(HACCKernels)
+#add_subdirectory(HACCKernels)
diff --git a/MultiSource/Benchmarks/DOE-ProxyApps-C/CMakeLists.txt b/MultiSource/Benchmarks/DOE-ProxyApps-C/CMakeLists.txt
index 3bbf8de56b..f4834f391e 100644
--- a/MultiSource/Benchmarks/DOE-ProxyApps-C/CMakeLists.txt
+++ b/MultiSource/Benchmarks/DOE-ProxyApps-C/CMakeLists.txt
@@ -3,7 +3,7 @@
 # Est. Memory Usage is different with reference output.
 if(NOT ARCH STREQUAL "CSKY")
   add_subdirectory(XSBench)
-  add_subdirectory(RSBench)
+  #add_subdirectory(RSBench)
 endif()
 add_subdirectory(Pathfinder)
 add_subdirectory(miniAMR)
diff --git a/MultiSource/Benchmarks/MallocBench/CMakeLists.txt b/MultiSource/Benchmarks/MallocBench/CMakeLists.txt
index e871a4a5cb..8d61d78f89 100644
--- a/MultiSource/Benchmarks/MallocBench/CMakeLists.txt
+++ b/MultiSource/Benchmarks/MallocBench/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_subdirectory(espresso)
-add_subdirectory(gs)
+#add_subdirectory(espresso)
+#add_subdirectory(gs)
 if(NOT "${ARCH}" STREQUAL "Alpha")
-  add_subdirectory(cfrac)
+  #add_subdirectory(cfrac)
 endif()
diff --git a/MultiSource/Benchmarks/Prolangs-C++/CMakeLists.txt b/MultiSource/Benchmarks/Prolangs-C++/CMakeLists.txt
index c669b6f2b4..3c7ff807ce 100644
--- a/MultiSource/Benchmarks/Prolangs-C++/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Prolangs-C++/CMakeLists.txt
@@ -1,9 +1,9 @@
-add_subdirectory(city)
-add_subdirectory(employ)
-add_subdirectory(life)
-add_subdirectory(ocean)
-add_subdirectory(primes)
-add_subdirectory(simul)
+#add_subdirectory(city)
+#add_subdirectory(employ)
+#add_subdirectory(life)
+#add_subdirectory(ocean)
+#add_subdirectory(primes)
+#add_subdirectory(simul)
 if(NOT TEST_SUITE_BENCHMARKING_ONLY)
   add_subdirectory(NP)
   add_subdirectory(deriv1)
diff --git a/MultiSource/Benchmarks/mediabench/CMakeLists.txt b/MultiSource/Benchmarks/mediabench/CMakeLists.txt
index b375382d3f..6388be4a78 100644
--- a/MultiSource/Benchmarks/mediabench/CMakeLists.txt
+++ b/MultiSource/Benchmarks/mediabench/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_subdirectory(adpcm)
-add_subdirectory(g721)
+#add_subdirectory(g721)
 add_subdirectory(gsm)
 add_subdirectory(jpeg)
 add_subdirectory(mpeg2)
diff --git a/litsupport/modules/hash.py b/litsupport/modules/hash.py
index 7cabc56ab4..b748c60854 100644
--- a/litsupport/modules/hash.py
+++ b/litsupport/modules/hash.py
@@ -11,7 +11,7 @@ def compute(context):
     executable = context.executable
     try:
         # Darwin's and Solaris' "strip" don't support these arguments.
-        if platform.system() != "Darwin" and platform.system() != "SunOS":
+        if False and platform.system() != "Darwin" and platform.system() != "SunOS":
             stripped_executable = executable + ".stripped"
             testplan.check_call(
                 [
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index e8812d8265..1b90fea8e3 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -40,4 +40,4 @@ else()
   llvm_add_host_executable(build-timeit timeit timeit.c)
 endif()
 
-add_executable(not ${CMAKE_CURRENT_SOURCE_DIR}/not.cpp)
+#add_executable(not ${CMAKE_CURRENT_SOURCE_DIR}/not.cpp)