mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-08-14 08:25:54 +00:00
44a8d09d15
* build with -mfloat-abi=hard are failing with: sysroots/foo/usr/include/gnu/stubs.h:7:29: fatal error: gnu/stubs-soft.h: No such file or directory because cmake wasn't respecting *flags set from OE Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
39 lines
1.6 KiB
Diff
39 lines
1.6 KiB
Diff
Upstream-Status: Backport
|
|
http://www.streamboard.tv/oscam/changeset/10068
|
|
http://www.streamboard.tv/oscam/changeset/10070
|
|
|
|
Index: /CMakeLists.txt
|
|
===================================================================
|
|
--- a/CMakeLists.txt (revision 10067)
|
|
+++ b/CMakeLists.txt (revision 10068)
|
|
@@ -625,8 +625,8 @@
|
|
list(GET GCC_VERSION_COMPONENTS 0 GCC_MINOR)
|
|
add_definitions ("-W -Wall ")
|
|
- set (CMAKE_C_FLAGS "-Wall -O2")
|
|
- set (CMAKE_CXX_FLAGS "-Wall -O2")
|
|
- set (CMAKE_C_FLAGS_DEBUG "-O0 -ggdb")
|
|
- set (CMAKE_CXX_FLAGS_DEBUG "-O0 -ggdb")
|
|
+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -O2")
|
|
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -O2")
|
|
+ set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -ggdb")
|
|
+ set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -ggdb")
|
|
endif (CMAKE_COMPILER_IS_GNUCC)
|
|
# some optimisations
|
|
Index: /csctapi/CMakeLists.txt
|
|
===================================================================
|
|
--- a/csctapi/CMakeLists.txt (revision 10069)
|
|
+++ b/csctapi/CMakeLists.txt (revision 10070)
|
|
@@ -6,8 +6,8 @@
|
|
list(GET GCC_VERSION_COMPONENTS 0 GCC_MINOR)
|
|
add_definitions ("-W -Wall ")
|
|
- set (CMAKE_C_FLAGS "-Wall -O2")
|
|
- set (CMAKE_CXX_FLAGS "-Wall -O2")
|
|
- set (CMAKE_C_FLAGS_DEBUG "-O0 -ggdb")
|
|
- set (CMAKE_CXX_FLAGS_DEBUG "-O0 -ggdb")
|
|
+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -O2")
|
|
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -O2")
|
|
+ set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -ggdb")
|
|
+ set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -ggdb")
|
|
endif (CMAKE_COMPILER_IS_GNUCC)
|
|
# Mac extra removes to avoid ranlib warnings in some situations
|