gem5-dev@gem5.org

The gem5 Developer List

View all threads

[XS] Change in gem5/gem5[develop]: ext: Update SST Makefile to use "src" for gem5 includes

BB
Bobby Bruce (Gerrit)
Wed, Apr 12, 2023 9:45 PM

Bobby Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/69718?usp=email )

Change subject: ext: Update SST Makefile to use "src" for gem5 includes
......................................................................

ext: Update SST Makefile to use "src" for gem5 includes

Using the include files from the "build" directory can result in a
complication failure if gem5 is compiled with "no-duplicate-sources" as
header files are not copied to "build".

To fix this, this Makefile now includes headers from the "src"
directory.

Change-Id: Ia01c2c97944b7538e3e944aa288099dee40820ff

M ext/sst/Makefile
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/sst/Makefile b/ext/sst/Makefile
index 9213d26..42d3be5 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/ -I../../ext
+CXXFLAGS=-std=c++17 -g -O${OFLAG} -fPIC ${shell pkg-config ${SST_VERSION}
--cflags} ${shell python3-config --includes} -I../../src/
-I../../ext/pybind11/include/ -I../../ext/softfloat/ -I../../ext
CPPFLAGS+=-MMD -MP
SRC=$(wildcard *.cc)

--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/69718?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: Ia01c2c97944b7538e3e944aa288099dee40820ff
Gerrit-Change-Number: 69718
Gerrit-PatchSet: 1
Gerrit-Owner: Bobby Bruce bbruce@ucdavis.edu
Gerrit-MessageType: newchange

Bobby Bruce has uploaded this change for review. ( https://gem5-review.googlesource.com/c/public/gem5/+/69718?usp=email ) Change subject: ext: Update SST Makefile to use "src" for gem5 includes ...................................................................... ext: Update SST Makefile to use "src" for gem5 includes Using the include files from the "build" directory can result in a complication failure if gem5 is compiled with "no-duplicate-sources" as header files are not copied to "build". To fix this, this Makefile now includes headers from the "src" directory. Change-Id: Ia01c2c97944b7538e3e944aa288099dee40820ff --- M ext/sst/Makefile 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/sst/Makefile b/ext/sst/Makefile index 9213d26..42d3be5 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/ -I../../ext +CXXFLAGS=-std=c++17 -g -O${OFLAG} -fPIC ${shell pkg-config ${SST_VERSION} --cflags} ${shell python3-config --includes} -I../../src/ -I../../ext/pybind11/include/ -I../../ext/softfloat/ -I../../ext CPPFLAGS+=-MMD -MP SRC=$(wildcard *.cc) -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/69718?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: Ia01c2c97944b7538e3e944aa288099dee40820ff Gerrit-Change-Number: 69718 Gerrit-PatchSet: 1 Gerrit-Owner: Bobby Bruce <bbruce@ucdavis.edu> Gerrit-MessageType: newchange