Revert "Revert "Adjust Subzero CMAKE=1 build to also use libc++ (like autoconf).""

This reverts commit a7340883. I reverted the wrong patch! BUG= https://code.google.com/p/nativeclient/issues/detail?id=4138 Review URL: https://codereview.chromium.org/1089323005

Revert "Revert "Adjust Subzero CMAKE=1 build to also use libc++ (like autoconf).""
9d92854a · Karl Schimpf · a7340883 · 9d92854a
Commit 9d92854a authored Apr 16, 2015 by Karl Schimpf
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

Makefile.standalone Makefile.standalone +1 -2

No files found.
--- a/Makefile.standalone
+++ b/Makefile.standalone
@@ -20,11 +20,9 @@ LLVM_SRC_PATH ?= ../llvm
 ifdef CMAKE
  # LLVM cmake build
  LLVM_BIN_PATH ?= ../../out/llvm_x86_64_linux_work/bin
-  STDLIB_FLAGS =
 else
  # LLVM autoconf build
  LLVM_BIN_PATH ?= ../../out/llvm_x86_64_linux_work/Release+Asserts/bin
-  STDLIB_FLAGS = -stdlib=libc++ -I$(LIBCXX_INSTALL_PATH)/include/c++/v1
 endif

 # The x86-32-specific sandboxed translator directory.
@@ -53,6 +51,7 @@ CLANG_PATH ?= $(shell readlink -e \
 # contain header files and corresponding libraries. This is used for
 # building the host binaries in conjuction with clang.
 LIBCXX_INSTALL_PATH ?= $(PNACL_TOOLCHAIN_ROOT)
+STDLIB_FLAGS := -stdlib=libc++ -I$(LIBCXX_INSTALL_PATH)/include/c++/v1

 HOST_ARCH ?= x86_64
 ifeq ($(HOST_ARCH),x86_64)