Skip to content

Commit

Permalink
Removed changes to include paths for SAI extension headers;
Browse files Browse the repository at this point in the history
as it turns out these changes were not required as originally reported in opencomputeproject#1531.

Signed-off-by: Chris Sommers <chrispsommers@gmail.com>
  • Loading branch information
chrispsommers committed Aug 3, 2022
1 parent ca88506 commit 66b300e
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions test/saithriftv2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,12 @@ METADIR := $(PREDIR)$(PREDIR)meta/

SAI_PREFIX = /usr
SAI_HEADER_DIR ?= $(SAI_PREFIX)/include/sai
SAI_EXT_HEADER_DIR ?= $(SAI_PREFIX)/include/experimental
SAI_LIBRARY_DIR ?= $(SAI_PREFIX)/lib
SAI_HEADERS = $(SAI_HEADER_DIR)/sai*.h

LIBS = -lthrift -lpthread
LDFLAGS = -L$(SAI_LIBRARY_DIR) -Wl,-rpath=$(SAI_LIBRARY_DIR)
CPPFLAGS = -I$(SAI_HEADER_DIR) -I$(SAI_EXT_HEADER_DIR) -I. -std=c++11
CPPFLAGS = -I$(SAI_HEADER_DIR) -I. -std=c++11

CPPFLAGS += -O0 -ggdb

Expand Down Expand Up @@ -83,7 +82,7 @@ $(PY_SOURCES): $(METADIR)sai.thrift
$(THRIFT) -o ./ --gen py -r $^

$(SAI_PY_HEADERS): $(SAI_HEADERS)
$(CTYPESGEN) --output-language=py32 -I/usr/include -I$(SAI_HEADER_DIR) -I$(SAI_EXT_HEADER_DIR) --include /usr/include/linux/limits.h $^ -o $@
$(CTYPESGEN) --output-language=py32 -I/usr/include -I$(SAI_HEADER_DIR) --include /usr/include/linux/limits.h $^ -o $@

$(ODIR)/%.o: gen-cpp/%.cpp meta
$(CXX) $(CPPFLAGS) -c $< -o $@ -I../../meta
Expand Down

0 comments on commit 66b300e

Please sign in to comment.