Rebased PNaCl localmods in LLVM to 223109

Makefile

 #===- ./Makefile -------------------------------------------*- Makefile -*--===#
 #
 #                     The LLVM Compiler Infrastructure
 #
 # This file is distributed under the University of Illinois Open Source
 # License. See LICENSE.TXT for details.
 #
 #===------------------------------------------------------------------------===#
 
 LEVEL := .
@@ skipping 25 matching lines @@
 endif
 
 ifeq ($(BUILD_EXAMPLES),1)
   OPTIONAL_DIRS += examples
 endif
 
 EXTRA_DIST := test unittests llvm.spec include win32 Xcode
 
 include $(LEVEL)/Makefile.config
 
+ifeq ($(PNACL_BROWSER_TRANSLATOR),1)
+  DIRS := $(filter-out tools/llvm-shlib runtime docs unittests, $(DIRS))
+  OPTIONAL_DIRS :=
+endif
+
 ifneq ($(ENABLE_SHARED),1)
   DIRS := $(filter-out tools/llvm-shlib, $(DIRS))
 endif
 
 ifneq ($(ENABLE_DOCS),1)
   DIRS := $(filter-out docs, $(DIRS))
 endif
 
 ifeq ($(MAKECMDGOALS),libs-only)
   DIRS := $(filter-out tools docs, $(DIRS))
@@ skipping 43 matching lines @@
   DIRS := $(filter-out unittests, $(DIRS))
 endif
 
 # If we're cross-compiling, build the build-hosted tools first
 ifeq ($(LLVM_CROSS_COMPILING),1)
 all:: cross-compile-build-tools
 
 clean::
         $(Verb) rm -rf BuildTools
 
+# @LOCALMOD-START Pass BUILD_CFLAGS et al through for host libcxx;
+# Only required to build on Ubuntu Precise
 cross-compile-build-tools:
         $(Verb) if [ ! -f BuildTools/Makefile ]; then \
           $(MKDIR) BuildTools; \
           cd BuildTools ; \
-          unset CFLAGS ; \
-          unset CXXFLAGS ; \
+          CFLAGS="$(BUILD_CFLAGS)" ; \
+          CXXFLAGS="$(BUILD_CXXFLAGS)" ; \
+          LDFLAGS="$(BUILD_LDFLAGS)" ; \
           AR=$(BUILD_AR) ; \
           AS=$(BUILD_AS) ; \
           LD=$(BUILD_LD) ; \
           CC=$(BUILD_CC) ; \
           CXX=$(BUILD_CXX) ; \
           unset SDKROOT ; \
           unset UNIVERSAL_SDK_PATH ; \
           configure_opts= ; \
           if test "$(ENABLE_LIBCPP)" -ne 0 ; then \
             configure_opts="$$configure_opts --enable-libcpp"; \
           fi; \
           $(PROJ_SRC_DIR)/configure --build=$(BUILD_TRIPLE) \
                 --host=$(BUILD_TRIPLE) --target=$(BUILD_TRIPLE) \
                 --disable-polly $$configure_opts; \
           cd .. ; \
         fi; \
         ($(MAKE) -C BuildTools \
           BUILD_DIRS_ONLY=1 \
+          PNACL_BROWSER_TRANSLATOR=0 \
           UNIVERSAL= \
           UNIVERSAL_SDK_PATH= \
           SDKROOT= \
           TARGET_NATIVE_ARCH="$(TARGET_NATIVE_ARCH)" \
           TARGETS_TO_BUILD="$(TARGETS_TO_BUILD)" \
           TARGET_LIBS="$(LIBS)" \
           ENABLE_OPTIMIZED=$(ENABLE_OPTIMIZED) \
           ENABLE_PROFILING=$(ENABLE_PROFILING) \
           ENABLE_COVERAGE=$(ENABLE_COVERAGE) \
           DISABLE_ASSERTIONS=$(DISABLE_ASSERTIONS) \
           ENABLE_EXPENSIVE_CHECKS=$(ENABLE_EXPENSIVE_CHECKS) \
           ENABLE_LIBCPP=$(ENABLE_LIBCPP) \
-          CFLAGS= \
-          CXXFLAGS= \
+          CC=$(BUILD_CC) \
+          CXX=$(BUILD_CXX) \
+          CFLAGS="$(BUILD_CFLAGS)" \
+          CXXFLAGS="$(BUILD_CXXFLAGS)" \
+          LDFLAGS="$(BUILD_LDFLAGS)" \
         ) || exit 1;
 endif
+# @LOCALMOD-END
 
 # Include the main makefile machinery.
 include $(LLVM_SRC_ROOT)/Makefile.rules
 
 # Specify options to pass to configure script when we're
 # running the dist-check target
 DIST_CHECK_CONFIG_OPTIONS = --with-llvmgccdir=$(LLVMGCCDIR)
 
 .PHONY: debug-opt-prof
 debug-opt-prof:
@@ skipping 127 matching lines @@
 # declare all targets at this level to be serial:
 
 .NOTPARALLEL:
 
 else # Building "Apple-style."
 # In an Apple-style build, once configuration is done, lines marked
 # "Apple-style" are removed with sed!  Please don't remove these!
 # Look for the string "Apple-style" in utils/buildit/build_llvm.
 include $(shell find . -name GNUmakefile) # Building "Apple-style."
 endif # Building "Apple-style."