Melissa Jost has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/67817?usp=email ) Change subject: tests: Fix failing SST and SystemC nightly tests ...................................................................... tests: Fix failing SST and SystemC nightly tests There was a bug with the SST and SystemC tests where they wouldn't compile due to a missing path for the gdbremote/signals.hh header, and this change includes that so they run properly. Change-Id: I9ff0404e327358fe2d1b77388bbcc1f807136ebe Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/67817 Reviewed-by: Bobby Bruce <bbruce@ucdavis.edu> Maintainer: Bobby Bruce <bbruce@ucdavis.edu> Tested-by: kokoro <noreply+kokoro@google.com> --- M ext/sst/Makefile M util/systemc/gem5_within_systemc/Makefile 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Bobby Bruce: Looks good to me, approved; Looks good to me, approved kokoro: Regressions pass diff --git a/ext/sst/Makefile b/ext/sst/Makefile index 682af3d..9213d26 100644 --- a/ext/sst/Makefile +++ b/ext/sst/Makefile @@ -4,7 +4,7 @@ OFLAG=3 LDFLAGS=-shared -fno-common ${shell pkg-config ${SST_VERSION} --libs} -L../../build/${ARCH}/ -Wl,-rpath ../../build/${ARCH} -CXXFLAGS=-std=c++17 -g -O${OFLAG} -fPIC ${shell pkg-config ${SST_VERSION} --cflags} ${shell python3-config --includes} -I../../build/${ARCH}/ -I../../ext/pybind11/include/ -I../../build/softfloat/ +CXXFLAGS=-std=c++17 -g -O${OFLAG} -fPIC ${shell pkg-config ${SST_VERSION} --cflags} ${shell python3-config --includes} -I../../build/${ARCH}/ -I../../ext/pybind11/include/ -I../../build/softfloat/ -I../../ext CPPFLAGS+=-MMD -MP SRC=$(wildcard *.cc) diff --git a/util/systemc/gem5_within_systemc/Makefile b/util/systemc/gem5_within_systemc/Makefile index cc6a389..f2baf88 100644 --- a/util/systemc/gem5_within_systemc/Makefile +++ b/util/systemc/gem5_within_systemc/Makefile @@ -39,7 +39,7 @@ SYSTEMC_INC = /opt/systemc/include SYSTEMC_LIB = /opt/systemc/lib-linux64 -CXXFLAGS = -I../../../build/$(ARCH) -L../../../build/$(ARCH) +CXXFLAGS = -I../../../build/$(ARCH) -L../../../build/$(ARCH) -I../../../ext/ CXXFLAGS += -I$(SYSTEMC_INC) -L$(SYSTEMC_LIB) CXXFLAGS += -std=c++17 CXXFLAGS += -g -DTRACING_ON -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/67817?usp=email To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: develop Gerrit-Change-Id: I9ff0404e327358fe2d1b77388bbcc1f807136ebe Gerrit-Change-Number: 67817 Gerrit-PatchSet: 4 Gerrit-Owner: Melissa Jost <melissakjost@gmail.com> Gerrit-Reviewer: Bobby Bruce <bbruce@ucdavis.edu> Gerrit-Reviewer: Hoa Nguyen <hoanguyen@ucdavis.edu> Gerrit-Reviewer: Jason Lowe-Power <power.jg@gmail.com> Gerrit-Reviewer: Melissa Jost <mkjost@ucdavis.edu> Gerrit-Reviewer: kokoro <noreply+kokoro@google.com> Gerrit-CC: gem5 Bot <gem5gerrittriggerbot@gmail.com> Gerrit-MessageType: merged