summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBart Van Assche <bvanassche@acm.org>2019-07-08 12:57:47 -0700
committerJens Axboe <axboe@kernel.dk>2019-07-08 15:25:57 -0600
commit64f89fa1469122ec480bf7d315a61de44c0a78c4 (patch)
tree504495680c0e7611451f779d5b959894a3748bdd
parentecefd7958eb32602df07f12e9808598b2c2de84b (diff)
downloadliburing-64f89fa1469122ec480bf7d315a61de44c0a78c4.tar.gz
liburing-64f89fa1469122ec480bf7d315a61de44c0a78c4.tar.bz2
Makefiles: Support specifying CFLAGS on the command line
This patch makes the liburing build work as expected for e.g. the following command: make CFLAGS=-m32 and avoids that the build fails as follows for the above command: make[1]: Entering directory 'liburing/test' cc -m32 -o poll poll.c -luring /usr/bin/ld: cannot find -luring collect2: error: ld returned 1 exit status Makefile:18: recipe for target 'poll' failed make[1]: *** [poll] Error 1 make[1]: Leaving directory 'software/liburing/test' Makefile:12: recipe for target 'all' failed make: *** [all] Error 2 Signed-off-by: Bart Van Assche <bvanassche@acm.org> Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r--examples/Makefile3
-rw-r--r--src/Makefile2
-rw-r--r--test/Makefile3
3 files changed, 5 insertions, 3 deletions
diff --git a/examples/Makefile b/examples/Makefile
index 6fe9bb9..ed73fcd 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -1,4 +1,5 @@
-CFLAGS ?= -g -O2 -Wall -D_GNU_SOURCE -L../src/
+CFLAGS ?= -g -O2
+override CFLAGS += -Wall -D_GNU_SOURCE -L../src/
all_targets += io_uring-test io_uring-cp link-cp
diff --git a/src/Makefile b/src/Makefile
index b68b57e..954e05e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -3,7 +3,7 @@ includedir=$(prefix)/include
libdir=$(prefix)/lib
CFLAGS ?= -g -fomit-frame-pointer -O2
-CFLAGS += -Wall -I.
+override CFLAGS += -Wall -I.
SO_CFLAGS=-shared -fPIC $(CFLAGS)
L_CFLAGS=$(CFLAGS)
LINK_FLAGS=
diff --git a/test/Makefile b/test/Makefile
index b94e29e..52b4c9e 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,4 +1,5 @@
-CFLAGS ?= -g -O2 -Wall -D_GNU_SOURCE -L../src/
+CFLAGS ?= -g -O2
+override CFLAGS += -Wall -D_GNU_SOURCE -L../src/
all_targets += poll poll-cancel ring-leak fsync io_uring_setup io_uring_register \
io_uring_enter nop sq-full cq-full 35fa71a030ca-test \