Changeset 354e54a


Ignore:
Timestamp:
09/04/14 16:29:22 (6 years ago)
Author:
Richard Sanger <rsangerarj@…>
Branches:
4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes
Children:
704229c
Parents:
7fda5c5
Message:

Fix building with DPDK enabled

This broke with the some of the changes (to makefiles etc.) in libtrace develop branch.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lib/Makefile.am

    rbd119b3 r354e54a  
    3333export RTE_SDK=@RTE_SDK@
    3434export RTE_TARGET=@RTE_TARGET@
     35export SAVED_CFLAGS:=$(CFLAGS)
     36export SAVED_CXXFLAGS:=$(CXXFLAGS)
    3537include $(RTE_SDK)/mk/rte.vars.mk
    3638# We need to add -Wl before the linker otherwise this breaks our build
     
    3840export DPDK_LIBTRACE_MK=dpdk_libtrace.mk
    3941include $(DPDK_LIBTRACE_MK)
     42export CFLAGS += $(SAVED_CFLAGS)
     43export CXXFLAGS += $(SAVED_CXXFLAGS)
    4044endif
    4145
Note: See TracChangeset for help on using the changeset viewer.