diff options
| author |   imarom <imarom@cisco.com> | 2015-09-21 18:55:15 +0300 |
|---|---|---|
| committer | imarom <imarom@cisco.com> | 2015-09-21 18:55:15 +0300 |
| commit | 14006b519bfd679227a87d0e6a2be9726774aafc (patch) | |
| tree | 88b8eed17c52d3460291248cfd807a19c592ea3b /linux_dpdk | |
| parent | d9e1cc14540431aa8baf8480625aa54c2a7c7175 (diff) | |
| parent | dbeb7ecc059bb78db54ec285a4216a661bbedd23 (diff) | |
Merge branch 'master' into rpc
Conflicts:
scripts/automation/trex_control_plane/client_utils/jsonrpc_client.py
Diffstat (limited to 'linux_dpdk')
| -rwxr-xr-x | linux_dpdk/ws_main.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux_dpdk/ws_main.py b/linux_dpdk/ws_main.py index fc9fc587..80db143c 100755 --- a/linux_dpdk/ws_main.py +++ b/linux_dpdk/ws_main.py @@ -616,7 +616,7 @@ def build_prog (bld, build_obj): bld.program(features='cxx cxxprogram', includes =includes_path, - cxxflags =build_obj.get_cxx_flags(), + cxxflags =(build_obj.get_cxx_flags()+['-std=gnu++11',]), linkflags = build_obj.get_link_flags() , lib=['pthread','dl'], use =[build_obj.get_dpdk_target(),'zmq'], |