diff --git a/build.sh b/build.sh
index 80263254eb9e5c35aae824dc69bfad3ec8945fe5..f74501743c50c08e5ca51897d055cf25468ad3aa 100755
--- a/build.sh
+++ b/build.sh
@@ -142,9 +142,10 @@ build()
   if $build_viewer
   then
     "$autobuild" build --no-configure -c $variant || fatal "failed building $variant"
-    
+    echo true >"$build_dir"/build_ok
+
     # Run build extensions
-    if [ $build_ok -eq 0 -a -d ${build_dir}/packages/build-extensions ]
+    if [ -d ${build_dir}/packages/build-extensions ]
     then
         for extension in ${build_dir}/packages/build-extensions/*.sh
         do
@@ -157,7 +158,6 @@ build()
     # *TODO: Make this a build extension.
     package_llphysicsextensions_tpv || fatal "failed building llphysicsextensions packages"
 
-    echo true >"$build_dir"/build_ok
   else
       echo "Skipping build due to configuration build_viewer=${build_viewer}"
       echo true >"$build_dir"/build_ok