summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/util
diff options
context:
space:
mode:
authorSteven Noonan <steven@uplinklabs.net>2009-10-11 02:52:48 -0700
committerSteven Noonan <steven@uplinklabs.net>2009-10-11 02:59:35 -0700
commitc3d83c65b910f87cf901652c72ef5ac81d581924 (patch)
treede71d1565ac9a2314338dc1d0565ae7a45e61a54 /crawl-ref/source/util
parentf4b8d77bc8edb99f66c8cb1b52c50acc385e3cc8 (diff)
downloadcrawl-ref-c3d83c65b910f87cf901652c72ef5ac81d581924.tar.gz
crawl-ref-c3d83c65b910f87cf901652c72ef5ac81d581924.zip
makefiles: inherit CC and CXX variables from top-level Makefile
Signed-off-by: Steven Noonan <steven@uplinklabs.net>
Diffstat (limited to 'crawl-ref/source/util')
-rw-r--r--crawl-ref/source/util/lua/src/Makefile12
-rw-r--r--crawl-ref/source/util/sqlite/Makefile2
2 files changed, 7 insertions, 7 deletions
diff --git a/crawl-ref/source/util/lua/src/Makefile b/crawl-ref/source/util/lua/src/Makefile
index d6cd279837..8460bb7f67 100644
--- a/crawl-ref/source/util/lua/src/Makefile
+++ b/crawl-ref/source/util/lua/src/Makefile
@@ -18,12 +18,12 @@ ifndef V
endif
endif
-CC= gcc
-CFLAGS= -O2 -Wall $(MYCFLAGS)
-AR= ar rcu
-RANLIB= ranlib
-RM= rm -f
-LIBS= -lm $(MYLIBS)
+CC ?= gcc
+CFLAGS = -O2 -Wall $(MYCFLAGS)
+AR = ar rcu
+RANLIB = ranlib
+RM = rm -f
+LIBS = -lm $(MYLIBS)
MYCFLAGS=
MYLDFLAGS=
diff --git a/crawl-ref/source/util/sqlite/Makefile b/crawl-ref/source/util/sqlite/Makefile
index 6f9686fbd8..ab7b00d8e0 100644
--- a/crawl-ref/source/util/sqlite/Makefile
+++ b/crawl-ref/source/util/sqlite/Makefile
@@ -10,7 +10,7 @@ endif
LIBSQL = libsqlite3.a
AR = ar rcu
-CC = gcc
+CC ?= gcc
RANLIB = ranlib
RM_F = rm -f