Commit 7a18758f authored by Boudewijn Rempt's avatar Boudewijn Rempt

Revert "fix Vc compiler flags"

This reverts commit dc17b45c7eb176d1f60b2505c6cfc1f7e90ac9dc.

This broke building on OpenSUSE, I'm afraid. I also checked on Kubuntu,
and there with this commit reverted, building still works. What problem
did the change solve, exactly?
parent 6b3c9d07
......@@ -486,9 +486,9 @@ if(HAVE_VC)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
"${CMAKE_SOURCE_DIR}/cmake/vc")
include("${CMAKE_SOURCE_DIR}/cmake/vc/VcMacros.cmake")
set(Vc_DEFINITIONS)
vc_set_preferred_compiler_flags()
include (VcMacros)
set(ADDITIONAL_VC_FLAGS "-Wabi -fabi-version=0 -ffp-contract=fast")
#Handle Vc master
if(Vc_VERSION_MAJOR GREATER 0 OR Vc_VERSION_MINOR GREATER 7)
......@@ -503,7 +503,7 @@ if(HAVE_VC)
macro(ko_compile_for_all_implementations_no_scalar _objs _src)
if(PACKAGERS_BUILD)
vc_compile_for_all_implementations(${_objs} ${_src} FLAGS ${Vc_DEFINITIONS} -fPIC ONLY SSE2 SSSE3 SSE4_1 AVX AVX2)
vc_compile_for_all_implementations(${_objs} ${_src} FLAGS ${ADDITIONAL_VC_FLAGS} -fPIC ONLY SSE2 SSSE3 SSE4_1 AVX AVX2)
else()
set(${_objs} ${_src})
endif()
......@@ -511,7 +511,7 @@ if(HAVE_VC)
macro(ko_compile_for_all_implementations _objs _src)
if(PACKAGERS_BUILD)
vc_compile_for_all_implementations(${_objs} ${_src} FLAGS ${Vc_DEFINITIONS} -fPIC ONLY Scalar SSE2 SSSE3 SSE4_1 AVX AVX2)
vc_compile_for_all_implementations(${_objs} ${_src} FLAGS ${ADDITIONAL_VC_FLAGS} -fPIC ONLY Scalar SSE2 SSSE3 SSE4_1 AVX AVX2)
else()
set(${_objs} ${_src})
endif()
......@@ -519,7 +519,7 @@ if(HAVE_VC)
else()
macro(ko_compile_for_all_implementations_no_scalar _objs _src)
if(PACKAGERS_BUILD)
vc_compile_for_all_implementations(${_objs} ${_src} FLAGS ${Vc_DEFINITIONS} -fPIC ONLY SSE2 SSSE3 SSE4_1 AVX)
vc_compile_for_all_implementations(${_objs} ${_src} FLAGS ${ADDITIONAL_VC_FLAGS} -fPIC ONLY SSE2 SSSE3 SSE4_1 AVX)
else()
set(${_objs} ${_src})
endif()
......@@ -527,7 +527,7 @@ if(HAVE_VC)
macro(ko_compile_for_all_implementations _objs _src)
if(PACKAGERS_BUILD)
vc_compile_for_all_implementations(${_objs} ${_src} FLAGS ${Vc_DEFINITIONS} -fPIC ONLY Scalar SSE2 SSSE3 SSE4_1 AVX)
vc_compile_for_all_implementations(${_objs} ${_src} FLAGS ${ADDITIONAL_VC_FLAGS} -fPIC ONLY Scalar SSE2 SSSE3 SSE4_1 AVX)
else()
set(${_objs} ${_src})
endif()
......
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