diff --git a/CMakeLists.txt b/CMakeLists.txt
index 53e5f33246aac63e0ff2dbf5e1769750dd75bb61..abab6ce8cb54c99bad14b45fa61951a83ffbf7d9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -546,6 +546,7 @@ if (CLANG_ENABLE_BOOTSTRAP)
 
   set(_BOOTSTRAP_DEFAULT_PASSTHROUGH
     PACKAGE_VERSION
+    PACKAGE_VENDOR
     LLVM_VERSION_MAJOR
     LLVM_VERSION_MINOR
     LLVM_VERSION_PATCH
@@ -555,7 +556,8 @@ if (CLANG_ENABLE_BOOTSTRAP)
     LLVM_VERSION_SUFFIX
     LLVM_BINUTILS_INCDIR
     CLANG_REPOSITORY_STRING
-    CMAKE_MAKE_PROGRAM)
+    CMAKE_MAKE_PROGRAM
+    CMAKE_OSX_ARCHITECTURES)
 
   if(TARGET compiler-rt)
     set(RUNTIME_DEP compiler-rt)