Commit 5c387ba4 authored by Brenden Blanco's avatar Brenden Blanco

Cleanup some flags left on during development

Signed-off-by: default avatarBrenden Blanco <bblanco@plumgrid.com>
parent 985adf61
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
cmake_minimum_required(VERSION 2.8.7) cmake_minimum_required(VERSION 2.8.7)
project(bcc) project(bcc)
set(CMAKE_BUILD_TYPE Debug) set(CMAKE_BUILD_TYPE Release)
enable_testing() enable_testing()
...@@ -41,8 +41,8 @@ FOREACH(DIR ${LLVM_INCLUDE_DIRS}) ...@@ -41,8 +41,8 @@ FOREACH(DIR ${LLVM_INCLUDE_DIRS})
include_directories("${DIR}/../tools/clang/include") include_directories("${DIR}/../tools/clang/include")
ENDFOREACH() ENDFOREACH()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") set(CMAKE_C_FLAGS "-Wall")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall") set(CMAKE_CXX_FLAGS "-std=c++11 -Wall")
endif() endif()
add_subdirectory(scripts) add_subdirectory(scripts)
......
...@@ -16,7 +16,6 @@ configure_file(libbpfprog.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libbpfprog.pc @ONLY) ...@@ -16,7 +16,6 @@ configure_file(libbpfprog.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libbpfprog.pc @ONLY)
# prune unused llvm static library stuff when linking into the new .so # prune unused llvm static library stuff when linking into the new .so
set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--exclude-libs=ALL") set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--exclude-libs=ALL")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-strict-aliasing")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
# if gcc 4.9 or higher is used, static libstdc++ is a good option # if gcc 4.9 or higher is used, static libstdc++ is a good option
...@@ -36,7 +35,6 @@ add_library(bpfprog SHARED bpf_common.cc bpf_module.cc libbpf.c) ...@@ -36,7 +35,6 @@ add_library(bpfprog SHARED bpf_common.cc bpf_module.cc libbpf.c)
#llvm_map_components_to_libnames(llvm_libs bpf mcjit irreader passes) #llvm_map_components_to_libnames(llvm_libs bpf mcjit irreader passes)
llvm_map_components_to_libnames(llvm_libs mcjit irreader passes linker llvm_map_components_to_libnames(llvm_libs mcjit irreader passes linker
instrumentation objcarcopts bitwriter option x86codegen) instrumentation objcarcopts bitwriter option x86codegen)
message(STATUS "llvm_libs=${llvm_libs}")
# order is important # order is important
set(clang_libs ${libclangFrontend} ${libclangSerialization} ${libclangDriver} ${libclangParse} set(clang_libs ${libclangFrontend} ${libclangSerialization} ${libclangDriver} ${libclangParse}
${libclangSema} ${libclangCodeGen} ${libclangAnalysis} ${libclangRewrite} ${libclangEdit} ${libclangSema} ${libclangCodeGen} ${libclangAnalysis} ${libclangRewrite} ${libclangEdit}
......
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