Commit 7146e997 by Jim Stichnoth

Subzero: Suppress a warning as a result of an updated clang.

Also improve some diagnostic output in the Makefile. BUG= none R=jpp@chromium.org Review URL: https://codereview.chromium.org/1941593002 .
parent 179a55d7
......@@ -32,6 +32,7 @@ else()
-DALLOW_WASM=0
-DPNACL_BROWSER_TRANSLATOR=0
)
add_compile_options(-Wno-undefined-var-template)
endif()
target_link_libraries(pnacl-sz pthread)
......@@ -27,4 +27,5 @@ else
CPP.Defines += -DALLOW_DUMP=1 -DALLOW_LLVM_CL=1 -DALLOW_LLVM_IR=1 \
-DALLOW_TIMERS=1 -DALLOW_LLVM_IR_AS_INPUT=1 -DALLOW_MINIMAL_BUILD=0 \
-DALLOW_WASM=0 -DPNACL_BROWSER_TRANSLATOR=0
CXX.Flags += -Wno-undefined-var-template
endif
......@@ -265,8 +265,10 @@ else
BASE_CXXFLAGS := $(BASE_CXXFLAGS) -DALLOW_WASM=0
endif
# TODO(stichnot,jpp): Restructure static fields in template classes to avoid
# needing -Wno-undefined-var-template .
CXXFLAGS := $(LLVM_CXXFLAGS) $(BASE_CXXFLAGS) $(CXX_DEFINES) $(HOST_FLAGS) \
$(STDLIB_FLAGS)
$(STDLIB_FLAGS) -Wno-undefined-var-template
SB_CXXFLAGS := $(SB_LLVM_CXXFLAGS) $(BASE_CXXFLAGS) $(BASE_CXX_DEFINES) \
-Wno-unknown-pragmas -I$(NACL_ROOT) -I$(NACL_ROOT)/..
......@@ -614,7 +616,7 @@ SPEC_SAMPLE_PEXE = $(NACL_ROOT)/tests/spec2k/176.gcc/gcc.opt.stripped.pexe
exists-nonsfi-x8632:
@if [ ! -f $(NONSFI_LOADER_X8632) ] ; then \
echo "Missing file $(NONSFI_LOADER_X8632)"; \
echo "Consider running 'scons nonsfi_loader'" \
echo "Consider running './scons nonsfi_loader'" \
"in the native_client directory."; \
exit 1 ; \
fi
......@@ -622,7 +624,7 @@ exists-nonsfi-x8632:
exists-nonsfi-arm32:
@if [ ! -f $(NONSFI_LOADER_ARM32) ] ; then \
echo "Missing file $(NONSFI_LOADER_ARM32)"; \
echo "Consider running 'scons platform=arm32 nonsfi_loader'" \
echo "Consider running './scons platform=arm nonsfi_loader'" \
"in the native_client directory."; \
exit 1 ; \
fi
......@@ -638,7 +640,7 @@ exists-spec:
@if [ ! -f $(SPEC_SAMPLE_PEXE) ] ; then \
echo "Missing file $(SPEC_SAMPLE_PEXE)"; \
echo "Consider running" \
"'run_all.sh BuildBenchmarks 0 SetupPnaclX8632Opt'" \
"'./run_all.sh BuildBenchmarks 0 SetupPnaclX8632Opt'" \
"in the native_client/tests/spec2k directory."; \
exit 1 ; \
fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment