Fix build

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 986d896285b542fb725e6bea31ffa614d033dde8..ae26daf017b8de7d9008e952edac59f412142520 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,26 +2,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 
 project(CoreProfiler)
 
-# Use uppercase CMAKE_BUILD_TYPE for the string comparisons below
-string(TOUPPER ${CMAKE_BUILD_TYPE} UPPERCASE_CMAKE_BUILD_TYPE)
-
-# For single-configuration toolset
-# set the different configuration defines.
-if (UPPERCASE_CMAKE_BUILD_TYPE STREQUAL DEBUG)
-  # First DEBUG
-  set_property(DIRECTORY  PROPERTY COMPILE_DEFINITIONS ${CLR_DEFINES_DEBUG_INIT})
-elseif (UPPERCASE_CMAKE_BUILD_TYPE STREQUAL CHECKED)
-  # Then CHECKED
-  set_property(DIRECTORY PROPERTY COMPILE_DEFINITIONS ${CLR_DEFINES_CHECKED_INIT})
-elseif (UPPERCASE_CMAKE_BUILD_TYPE STREQUAL RELEASE)
-  # Then RELEASE
-  set_property(DIRECTORY PROPERTY COMPILE_DEFINITIONS ${CLR_DEFINES_RELEASE_INIT})
-elseif (UPPERCASE_CMAKE_BUILD_TYPE STREQUAL RELWITHDEBINFO)
-  # And then RELWITHDEBINFO
-  set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS ${CLR_DEFINES_RELWITHDEBINFO_INIT})
-else ()
-  message(FATAL_ERROR "Unknown build type! Set CMAKE_BUILD_TYPE to DEBUG, CHECKED, RELEASE, or RELWITHDEBINFO!")
-endif ()
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wno-null-conversion")
 
 set(CLR_CMAKE_PLATFORM_UNIX 1)
 

diff --git a/packaging/coreprofiler.spec b/packaging/coreprofiler.spec
index d480cf40df6611ad5d8990e019084d363aa7a444..65a6193322a241f9aed22fd31379fdcf02ad1f2f 100644 (file)
--- a/packaging/coreprofiler.spec
+++ b/packaging/coreprofiler.spec
@@ -3,7 +3,7 @@
 Name:      coreprofiler
 Summary:   PUT SUMMARY HERE
 Version:   1.0.0
-Release:   1.rt
+Release:   1
 Group:     Development/Toolchain
 License:   MIT
 Source0:   coreprofiler.tar.gz
@@ -53,13 +53,11 @@ cd coreprofiler
 cp %{SOURCE1001} ..
 %build
 
-%ifarch armv7l
-%define _overridefile clang-compiler-override-arm.txt
+%ifarch %{arm}
 export CFLAGS=" --target=%{_host} -Wno-deprecated-declarations"
 export CXXFLAGS=" --target=%{_host} -Wno-deprecated-declarations"
 export ASMFLAGS=" --target=%{_host}"
 %else
-%define _overridefile clang-compiler-override.txt
 export GCC_INSTALL_DIR=$(gcc -print-search-dirs | sed -ne '/install: /s/install: //p')
 export LLVM_LIBDIR=$(llvm-config --libdir)
 export LLVM_INCLUDEDIR=$(llvm-config --includedir)
@@ -89,10 +87,10 @@ cmake ../coreprofiler \
     -DCLR_BIN_DIR=%{_datarootdir}/%{netcoreappdir} \
     -DCLR_SRC_DIR=%{_datarootdir}/%{netcoreappdir} \
     -DCMAKE_BUILD_TYPE=%{buildtype} \
-    -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-    -DCMAKE_USER_MAKE_RULES_OVERRIDE=../coreprofiler/%{_overridefile} \
     -DCLR_CMAKE_TARGET_ARCH_%{ARCH}=1
 make %{?jobs:-j%jobs}
+#    -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
+#    -DCMAKE_USER_MAKE_RULES_OVERRIDE=../coreprofiler/%{_overridefile} \
 
 %install
 cd build