diff options
| author | Max Filippov <jcmvbkbc@gmail.com> | 2016-10-16 13:12:43 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-10-22 16:22:10 +0200 |
| commit | eb26296666d81c4f85355a94c16dc190d3f2015d (patch) | |
| tree | 45ac390d908d2ea02fb27c20eb7e603d9373d712 /package/opencv3/opencv3.mk | |
| parent | d1a312d2097bad24fb1c0639c6801c2a4f6c2e7f (diff) | |
| download | buildroot-eb26296666d81c4f85355a94c16dc190d3f2015d.tar.gz buildroot-eb26296666d81c4f85355a94c16dc190d3f2015d.zip | |
package/opencv3: fix CMAKE_CXX_FLAGS
The commit 4904c4c "package/opencv3: use BR2_TOOLCHAIN_HAS_LIBATOMIC"
overrides CMAKE_CXX_FLAGS with the single -latomic, losing all ABI
CFLAGS that are passed there by default. This breaks build on xtensa
where ABI CFLAGS contain important code generation options.
Append $(TARGET_CXXFLAGS) to CMAKE_CXX_FLAGS along with -latomic.
Fixes:
http://autobuild.buildroot.net/results/7f1c96abd8fbb5b358a07100ab623316e9bb9dcd
http://autobuild.buildroot.net/results/e0c93d0f6d1da0d62d4dbba211a275bfe75e9645
http://autobuild.buildroot.net/results/53e7e4b4b6a7b48b8012799d7507f7594dbf01b2
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/opencv3/opencv3.mk')
| -rw-r--r-- | package/opencv3/opencv3.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/opencv3/opencv3.mk b/package/opencv3/opencv3.mk index 2529de9f4b..10660a90fb 100644 --- a/package/opencv3/opencv3.mk +++ b/package/opencv3/opencv3.mk @@ -12,7 +12,7 @@ OPENCV3_LICENSE_FILES = LICENSE # Uses __atomic_fetch_add_4 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -OPENCV3_CONF_OPTS += -DCMAKE_CXX_FLAGS="-latomic" +OPENCV3_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic" endif # OpenCV component options |
