chiark / gitweb /
Makefile: honour CMDLINE_CFLAGS, CMDLINE_CPPFLAGS, CMDLINE_LDFLAGS.
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 29 Nov 2013 20:41:17 +0000 (20:41 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 29 Nov 2013 20:41:17 +0000 (20:41 +0000)
debian/changelog
settings.make

index 2219cc9..376be02 100644 (file)
@@ -22,6 +22,7 @@ chiark-utils (4.3.0) unstable; urgency=medium
   * watershed; Provide -h and --help options.  Closes:#659989.
 
   Build and portability fixes:
+  * Makefile: honour CMDLINE_CFLAGS, CMDLINE_CPPFLAGS, CMDLINE_LDFLAGS.
   * xbatmon-simple: Saner build rune.
   * cprogs/Makefile: clean deletes $PROGRAMS
   * random-word: Some perl-mode emacs formatting glitch workarounds.
index 5471dbd..2a0b183 100644 (file)
@@ -23,8 +23,9 @@ CONFIG_CPPFLAGS=      -DRWBUFFER_SIZE_MB=$(RWBUFFER_SIZE_MB) \
                        -DREALLY_CHECK_FILE='"/etc/inittab"'
 
 CC=            gcc
-CFLAGS=                $(WARNINGS) $(OPTIMISE) $(DEBUG)
-CPPFLAGS=      $(CONFIG_CPPFLAGS)
+CFLAGS=                $(WARNINGS) $(OPTIMISE) $(DEBUG) $(CMDLINE_CFLAGS)
+CPPFLAGS=      $(CONFIG_CPPFLAGS) $(CMDLINE_CPPFLAGS)
+LDFLAGS=       $(CMDLINE_LDFLAGS)
 
 WARNINGS=      -Wall -Wwrite-strings -Wmissing-prototypes \
                -Wstrict-prototypes -Wpointer-arith -Wno-pointer-sign