Andrew Geissler | 4b7c115 | 2020-11-30 19:55:29 -0600 | [diff] [blame] | 1 | From f8cb818ca96fc2a45a04448a51f25a277ec183db Mon Sep 17 00:00:00 2001 |
Brad Bishop | 0e2770c | 2020-01-21 07:31:46 -0500 | [diff] [blame] | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Wed, 15 Jan 2020 20:21:58 -0800 |
| 4 | Subject: [PATCH] example-clients: Use c++ compiler for jack_simdtests |
| 5 | |
| 6 | It uses c++ sources and runtime therefore its best to use c++ compiler |
| 7 | to build it so it can find the correct runtime, cross compiling with |
| 8 | clang fails |
| 9 | |
| 10 | x86_64-yoe-linux-ld: example-clients/simdtests.cpp.28.o: undefined reference to symbol '__cxa_call_unexpected@@CXXABI_1.3' |
| 11 | |
| 12 | Upstream-Status: Submitted [https://github.com/jackaudio/jack2/pull/536] |
| 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 14 | --- |
Andrew Geissler | 4b7c115 | 2020-11-30 19:55:29 -0600 | [diff] [blame] | 15 | example-clients/wscript | 9 +++++++-- |
| 16 | 1 file changed, 7 insertions(+), 2 deletions(-) |
Brad Bishop | 0e2770c | 2020-01-21 07:31:46 -0500 | [diff] [blame] | 17 | |
Brad Bishop | 0e2770c | 2020-01-21 07:31:46 -0500 | [diff] [blame] | 18 | --- a/example-clients/wscript |
| 19 | +++ b/example-clients/wscript |
Andrew Geissler | 4b7c115 | 2020-11-30 19:55:29 -0600 | [diff] [blame] | 20 | @@ -49,10 +49,15 @@ def build(bld): |
Brad Bishop | 0e2770c | 2020-01-21 07:31:46 -0500 | [diff] [blame] | 21 | else: |
Andrew Geissler | 4b7c115 | 2020-11-30 19:55:29 -0600 | [diff] [blame] | 22 | use = ['clientlib'] |
| 23 | |
| 24 | + if example_program == 'jack_simdtests': |
| 25 | + ftrs = 'cxx cxxprogram' |
| 26 | + else: |
| 27 | + ftrs = 'c cprogram' |
| 28 | + |
| 29 | if bld.env['IS_MACOSX']: |
| 30 | - prog = bld(features='c cprogram', framework = ['Foundation']) |
| 31 | + prog = bld(features = ftrs, framework = ['Foundation']) |
| 32 | else: |
| 33 | - prog = bld(features='c cprogram') |
| 34 | + prog = bld(features = ftrs) |
Brad Bishop | 0e2770c | 2020-01-21 07:31:46 -0500 | [diff] [blame] | 35 | prog.includes = os_incdir + ['../common/jack', '../common'] |
Andrew Geissler | 4b7c115 | 2020-11-30 19:55:29 -0600 | [diff] [blame] | 36 | prog.source = example_program_source |
| 37 | prog.use = use |