-VALID_ARCHS = $(VALID_ARCHS_$(PLATFORM_NAME));
-VALID_ARCHS_iphoneos = armv7 armv7s arm64;
-VALID_ARCHS_iphonesimulator = i386 x86_64;
-VALID_ARCHS_macosx = i386 ppc x86_64 ppc64;
-WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare;
-
-USR_LOCAL_INCLUDE_HEADER_SEARCH_PATH = $(USR_LOCAL_INCLUDE_HEADER_SEARCH_PATH_$(PLATFORM_NAME));
-USR_LOCAL_INCLUDE_HEADER_SEARCH_PATH_iphoneos = $(BUILT_PRODUCTS_DIR)/usr/local/include;
-USR_LOCAL_INCLUDE_HEADER_SEARCH_PATH_iphonesimulator = $(BUILT_PRODUCTS_DIR)$(SDKROOT)/usr/local/include;
-USR_LOCAL_INCLUDE_HEADER_SEARCH_PATH_macosx = $(BUILT_PRODUCTS_DIR)/usr/local/include;
-
-HEADER_SEARCH_PATHS = . icu "${BUILT_PRODUCTS_DIR}/usr/local/include" "$(USR_LOCAL_INCLUDE_HEADER_SEARCH_PATH)" $(HEADER_SEARCH_PATHS);
-
-BUILD_TYPE = $(BUILD_TYPE_$(CONFIGURATION));
-BUILD_TYPE_ = Production;
-BUILD_TYPE_Debug = Debug;
-BUILD_TYPE_Release = Release;
-BUILD_TYPE_Production = Production;
-BUILD_TYPE_Development = Debug;
-BUILD_TYPE_Deployment = Release;
-BUILD_TYPE_Production_Deployment = Production;
-BUILD_TYPE_Development_Hardware = Debug;
-BUILD_TYPE_Deployment_Hardware = Release;
-BUILD_TYPE_Production_Hardware = Production;
+WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough;
+
+LLVM_LOCAL_HEADER_PATH[sdk=macosx*] = "$(BUILT_PRODUCTS_DIR)/usr/local/LLVMForJavaScriptCore/include";
+
+LLVM_SYSTEM_HEADER_PATH[sdk=macosx*] = /usr/local/LLVMForJavaScriptCore/include;
+
+HEADER_SEARCH_PATHS = . icu $(LLVM_LOCAL_HEADER_PATH) "${BUILT_PRODUCTS_DIR}/ExtraIncludesForLocalLLVMBuild" $(LLVM_SYSTEM_HEADER_PATH) "${BUILT_PRODUCTS_DIR}/usr/local/include" $(HEADER_SEARCH_PATHS);