diff --git a/.circleci/config.yml b/.circleci/config.yml
index c1e0a5816445b..4577f31498d21 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -143,7 +143,7 @@ commands:
             ./emsdk install tot
             ./emsdk activate tot
             # Write the version of clang into a file for use in the ccache key
-            ./upstream/bin/clang --version > clang_version.txt
+            echo "test21" > clang_version.txt
             echo "clang version:"
             cat ~/emsdk/clang_version.txt
             # Remove the emsdk version of emscripten to save space in the
@@ -179,36 +179,38 @@ commands:
       - run:
           name: Ccache stats and configuration
           command: |
+            ccache --version
             ccache -s
             ccache --print-stats
             ccache -p
       - run:
           name: embuilder build ALL
           command: |
-            ./embuilder build ALL
-            ./test/runner test_hello_world
-      - run:
-          name: embuilder (LTO)
-          command: |
-            ./embuilder build MINIMAL --lto
-            ./test/runner test_hello_world
-      - run:
-          name: embuilder (WASM64)
-          command: |
-            ./embuilder build MINIMAL --wasm64
-      - run:
-          name: embuilder (PIC)
-          command: |
-            ./embuilder build MINIMAL_PIC --pic
-            ./test/runner test_hello_world
-      - run:
-          name: embuilder (PIC+LTO)
-          command: |
-            ./embuilder build MINIMAL --pic --lto
+            ./embuilder build crtbegin
             ./test/runner test_hello_world
+      # - run:
+      #     name: embuilder (LTO)
+      #     command: |
+      #       ./embuilder build MINIMAL --lto
+      #       ./test/runner test_hello_world
+      # - run:
+      #     name: embuilder (WASM64)
+      #     command: |
+      #       ./embuilder build MINIMAL --wasm64
+      # - run:
+      #     name: embuilder (PIC)
+      #     command: |
+      #       ./embuilder build MINIMAL_PIC --pic
+      #       ./test/runner test_hello_world
+      # - run:
+      #     name: embuilder (PIC+LTO)
+      #     command: |
+      #       ./embuilder build MINIMAL --pic --lto
+      #       ./test/runner test_hello_world
       - run:
           name: "Ccache stats and configuration"
           command: |
+            ls ~/ccache-debug || echo "no ccache-debug"
             ls ~/cache/sysroot/lib/wasm32-emscripten || echo "no build"
             cat ~/cache/sysroot/lib/wasm32-emscripten/crtbegin.o.ccache-log
             date
@@ -230,18 +232,12 @@ commands:
             - vms/
             - wasi-sdk/
             - .jsvu/
-      - when:
-          # Only the main branch will store its cache results, and only the non-main branches
-          # will use cached results. This prevents untrusted PRs from polluting caches used
-          # by other branches.
-          condition:
-            equal: [ "main", << pipeline.git.branch >> ]
-          steps:
-            - save_cache:
-                name: "Save Ccache cache"
-                paths:
-                  - ~/.ccache
-                key: clang-{{ checksum "~/emsdk/clang_version.txt" }}
+
+      - save_cache:
+          name: "Save Ccache cache"
+          paths:
+            - ~/.ccache
+          key: clang-{{ checksum "~/emsdk/clang_version.txt" }}
 
   prepare-for-tests:
     description: "Setup emscripten tests"
@@ -577,6 +573,7 @@ jobs:
       CCACHE_DEBUG: 1
       CCACHE_DEBUGLEVEL: 1
     steps:
+      - run: echo "${CIRCLE_PR_NUMBER} ${CIRCLE_PULL_REQUEST} ${CIRCLE_REPOSITORY_URL} ${CIRCLE_BRANCH} << pipeline.project.git_url >> << pipeline.git.branch >>"
       - checkout
       - run:
           name: get wasmer
diff --git a/tools/system_libs.py b/tools/system_libs.py
index 54296e0923bf4..314ef07e554ee 100644
--- a/tools/system_libs.py
+++ b/tools/system_libs.py
@@ -159,7 +159,7 @@ def get_top_level_ninja_file():
 
 
 def run_ninja(build_dir):
-  cmd = ['ninja', '-C', build_dir, f'-j{utils.get_num_cores()}']
+  cmd = ['ninja', '-v', '-C', build_dir, f'-j{utils.get_num_cores()}']
   if shared.PRINT_SUBPROCS:
     cmd.append('-v')
   shared.check_call(cmd, env=clean_env())