Skip to content

Commit 0bae215

Browse files
galakcfriedt
authored andcommitted
samples: modules: thrift: filter on CONFIG_FULL_LIBCPP_SUPPORTED
Change sample to set CONFIG_FULL_LIBCPP_REQUIRED and to filter on CONFIG_FULL_LIBCPP_SUPPORTED. Since not all toolchains provide a full libc++ this will restrict the sample only to those environments that do. Signed-off-by: Kumar Gala <kumar.gala@intel.com>
1 parent 2b4fdd1 commit 0bae215

File tree

4 files changed

+4
-6
lines changed

4 files changed

+4
-6
lines changed

samples/modules/thrift/hello/client/prj.conf

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
# CONFIG_LIB_CPLUSPLUS Dependencies
2-
CONFIG_NEWLIB_LIBC=y
3-
CONFIG_NEWLIB_LIBC_NANO=n
2+
CONFIG_REQUIRES_FULL_LIBCPP=y
43

54
# CONFIG_THRIFT Dependencies
65
CONFIG_CPP=y
76
CONFIG_STD_CPP17=y
87
CONFIG_CPP_EXCEPTIONS=y
9-
CONFIG_EXTERNAL_LIBCPP=y
108
CONFIG_POSIX_API=y
119
CONFIG_NETWORKING=y
1210
CONFIG_NET_SOCKETS=y

samples/modules/thrift/hello/client/sample.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ common:
77
modules:
88
- thrift
99
platform_allow: mps2_an385 qemu_x86_64
10+
filter: CONFIG_FULL_LIBCPP_SUPPORTED
1011
tests:
1112
sample.thrift.hello.server.binaryProtocol: {}
1213
sample.thrift.hello.server.compactProtocol:

samples/modules/thrift/hello/server/prj.conf

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
# Need a full libc++
2-
CONFIG_NEWLIB_LIBC=y
3-
CONFIG_NEWLIB_LIBC_NANO=n
2+
CONFIG_REQUIRES_FULL_LIBCPP=y
43

54
# CONFIG_THRIFT Dependencies
65
CONFIG_CPP=y
76
CONFIG_STD_CPP17=y
87
CONFIG_CPP_EXCEPTIONS=y
9-
CONFIG_EXTERNAL_LIBCPP=y
108
CONFIG_POSIX_API=y
119
CONFIG_NET_SOCKETPAIR=y
1210
CONFIG_HEAP_MEM_POOL_SIZE=16384

samples/modules/thrift/hello/server/sample.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ common:
77
modules:
88
- thrift
99
platform_allow: mps2_an385 qemu_x86_64
10+
filter: CONFIG_FULL_LIBCPP_SUPPORTED
1011
tests:
1112
sample.thrift.hello.server.binaryProtocol: {}
1213
sample.thrift.hello.server.compactProtocol:

0 commit comments

Comments
 (0)