From 4f634d4cd3254dfc68b65e63be32708105032101 Mon Sep 17 00:00:00 2001 From: Joshua Bakita Date: Thu, 22 Oct 2020 00:24:34 -0400 Subject: Fix Makefiles so that a custom CFLAGS doesn't break the build --- all_pairs/Makefile | 4 ++-- baseline/Makefile | 2 +- dis/Makefile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/all_pairs/Makefile b/all_pairs/Makefile index 0042372..f0b284e 100644 --- a/all_pairs/Makefile +++ b/all_pairs/Makefile @@ -1,7 +1,7 @@ LIBLITMUS ?= /media/speedy/litmus/liblitmus CC ?= gcc -CFLAGS = -pthread -O2 -I.. -DPAIRED -LDFLAGS = -lrt +override CFLAGS += -pthread -O2 -I.. -DPAIRED +LDFLAGS += -lrt COMMON = ../extra.h # Handle cases where we're also profiling with the MMDC on the i.MX6Q diff --git a/baseline/Makefile b/baseline/Makefile index 40b57f4..d6ab976 100644 --- a/baseline/Makefile +++ b/baseline/Makefile @@ -1,6 +1,6 @@ LIBLITMUS ?= /media/speedy/litmus/liblitmus CC ?= gcc -CFLAGS = -pthread -O2 -I.. +override CFLAGS = -pthread -O2 -I.. LDFLAGS = -lrt COMMON = ../extra.h diff --git a/dis/Makefile b/dis/Makefile index df93116..88fa7c2 100755 --- a/dis/Makefile +++ b/dis/Makefile @@ -4,7 +4,7 @@ # that a good Makefile should follow. Sorry - at least I have one.) LIBLITMUS ?= /media/speedy/litmus/liblitmus CC ?= gcc -CFLAGS += -pthread -O2 -I.. +override CFLAGS += -pthread -O2 -I.. LDFLAGS = -lrt -lm COMMON = ../extra.h -- cgit v1.2.2