diff options
| author | Kevin Brodsky <kevin.brodsky@arm.com> | 2018-09-18 15:20:04 +0100 |
|---|---|---|
| committer | Ciro Santilli <ciro.santilli@arm.com> | 2018-09-26 13:12:12 +0000 |
| commit | 7a6183aa6162419912daa5647d13f030ab0904e2 (patch) | |
| tree | 17c1c8e7253608029cafd62bae5240143e0b883d | |
| parent | a470ef51456fe05e8d8ae6a95493e1da5a088a0d (diff) | |
| download | gem5-7a6183aa6162419912daa5647d13f030ab0904e2.tar.xz | |
util: Do not use $(PWD) in Makefiles
644e8cdf5ee7 ("util: Move the m5ops.h file to a shared directory")
added include/ to the include path for m5 Makefiles, based on
$(PWD): $(PWD)/../../include.
Unfortunately, this breaks when using `make -C <path>`, as -C does
not move PWD accordingly. The fix is simply to remove $(PWD), as a
relative path is just fine here.
Change-Id: Ia046c29761363b6670e52c52a604c7e70a6a305a
Signed-off-by: Kevin Brodsky <kevin.brodsky@arm.com>
Signed-off-by: Ciro Santilli <ciro.santilli@arm.com>
Reviewed-by: Ciro Santilli <ciro.santilli@arm.com>
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/12844
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Jason Lowe-Power <jason@lowepower.com>
| -rw-r--r-- | util/m5/Makefile.aarch64 | 2 | ||||
| -rw-r--r-- | util/m5/Makefile.alpha | 2 | ||||
| -rw-r--r-- | util/m5/Makefile.arm | 2 | ||||
| -rw-r--r-- | util/m5/Makefile.sparc | 2 | ||||
| -rw-r--r-- | util/m5/Makefile.thumb | 4 | ||||
| -rw-r--r-- | util/m5/Makefile.x86 | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/util/m5/Makefile.aarch64 b/util/m5/Makefile.aarch64 index 08180665a..2e05ac7c6 100644 --- a/util/m5/Makefile.aarch64 +++ b/util/m5/Makefile.aarch64 @@ -55,7 +55,7 @@ JR=jar #JDK_PATH=/path/to/jdk/version_number CFLAGS=-O2 -I $(JDK_PATH)/include/ -I $(JDK_PATH)/include/linux \ - -I$(PWD)/../../include -march=armv8-a + -I../../include -march=armv8-a LDFLAGS=-static -L. -lm5 LIB_OBJS=m5op_arm_A64.o m5_mmap.o diff --git a/util/m5/Makefile.alpha b/util/m5/Makefile.alpha index c21f67cf1..cb476eae0 100644 --- a/util/m5/Makefile.alpha +++ b/util/m5/Makefile.alpha @@ -35,7 +35,7 @@ CC=$(CROSS_COMPILE)gcc AS=$(CROSS_COMPILE)as LD=$(CROSS_COMPILE)ld -CFLAGS=-O2 -I$(PWD)/../../include +CFLAGS=-O2 -I../../include OBJS=m5.o m5op_alpha.o m5_mmap.o all: m5 diff --git a/util/m5/Makefile.arm b/util/m5/Makefile.arm index 14d73538b..e7a26ce9b 100644 --- a/util/m5/Makefile.arm +++ b/util/m5/Makefile.arm @@ -55,7 +55,7 @@ JR=jar #JDK_PATH=/path/to/jdk/version_number CFLAGS=-O2 -I $(JDK_PATH)/include/ -I $(JDK_PATH)/include/linux \ - -I$(PWD)/../../include -march=armv7-a + -I../../include -march=armv7-a LDFLAGS=-L. -lm5 -static LIB_OBJS=m5op_arm.o m5_mmap.o diff --git a/util/m5/Makefile.sparc b/util/m5/Makefile.sparc index e1b17ea2c..87c3d1532 100644 --- a/util/m5/Makefile.sparc +++ b/util/m5/Makefile.sparc @@ -35,7 +35,7 @@ CC=$(CROSS_COMPILE)gcc AS=$(CROSS_COMPILE)as LD=$(CROSS_COMPILE)ld -CFLAGS=-O2 -m64 -I$(PWD)/../../include +CFLAGS=-O2 -m64 -I../../include OBJS=m5.o m5op_sparc.o m5_mmap.o all: m5 diff --git a/util/m5/Makefile.thumb b/util/m5/Makefile.thumb index 60b6803b2..d117bf0d0 100644 --- a/util/m5/Makefile.thumb +++ b/util/m5/Makefile.thumb @@ -49,8 +49,8 @@ AS=$(CROSS_COMPILE)as LD=$(CROSS_COMPILE)ld AR=$(CROSS_COMPILE)ar -#CFLAGS=-O2 -march=armv7 -mthumb -I$(PWD)/../../include -CFLAGS=-O2 -mthumb -I$(PWD)/../../include +#CFLAGS=-O2 -march=armv7 -mthumb -I../../include +CFLAGS=-O2 -mthumb -I../../include LDFLAGS=-L. -lm5 OBJS=m5.o diff --git a/util/m5/Makefile.x86 b/util/m5/Makefile.x86 index f56b37c8b..89f8f9231 100644 --- a/util/m5/Makefile.x86 +++ b/util/m5/Makefile.x86 @@ -31,7 +31,7 @@ CC=gcc AS=as LD=ld -CFLAGS?=-O2 -DM5OP_ADDR=0xFFFF0000 -I$(PWD)/../../include +CFLAGS?=-O2 -DM5OP_ADDR=0xFFFF0000 -I../../include OBJS=m5.o m5op_x86.o m5_mmap.o LUA_HEADER_INCLUDE=$(shell pkg-config --cflags-only-I lua51) LUA_OBJS=lua_gem5Op.opic m5op_x86.opic m5_mmap.opic |