Index: test/lit.cfg
===================================================================
--- test/lit.cfg
+++ test/lit.cfg
@@ -83,7 +83,12 @@
                                'LIBCLANG_LOGGING', 'LIBCLANG_BGPRIO_INDEX',
                                'LIBCLANG_BGPRIO_EDIT', 'LIBCLANG_NOTHREADS',
                                'LIBCLANG_RESOURCE_USAGE',
-                               'LIBCLANG_CODE_COMPLETION_LOGGING']
+                               'LIBCLANG_CODE_COMPLETION_LOGGING',
+                               'MACOSX_DEPLOYMENT_TARGET',
+                               'IPHONEOS_DEPLOYMENT_TARGET',
+                               'SDKROOT', 'CCC_OVERRIDE_OPTIONS',
+                               'CC_PRINT_OPTIONS', 'CC_PRINT_HEADERS',
+                               'CC_LOG_DIAGNOSTICS']
 # Clang/Win32 may refer to %INCLUDE%. vsvarsall.bat sets it.
 if platform.system() != 'Windows':
     possibly_dangerous_env_vars.append('INCLUDE')
@@ -483,5 +488,3 @@
                                          '/usr/lib/libgmalloc.dylib')
 if use_gmalloc:
      config.environment.update({'DYLD_INSERT_LIBRARIES' : gmalloc_path_str})
-
-lit.util.usePlatformSdkOnDarwin(config, lit_config)