Revert "Revert "Adjust Subzero CMAKE=1 build to also use libc++ (like autoconf).""
This reverts commit a73408832dd716c3d076fe7f612194de614d7eee.
I reverted the wrong patch!
BUG= https://code.google.com/p/nativeclient/issues/detail?id=4138
Review URL: https://codereview.chromium.org/1089323005
diff --git a/Makefile.standalone b/Makefile.standalone
index 5673cfe..4c369d2 100644
--- a/Makefile.standalone
+++ b/Makefile.standalone
@@ -20,11 +20,9 @@
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 @@
# 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)
