diff options
| author | Jason Evans <jasone@canonware.com> | 2016-12-16 15:18:55 (GMT) |
|---|---|---|
| committer | Jason Evans <jasone@canonware.com> | 2016-12-16 15:24:36 (GMT) |
| commit | 194d6f9de8ff92841b67f38a2a6a06818e3240dd (patch) | |
| tree | f5beca05a9b5ba597a5f0e58a4b8d02b1e4027a7 /Makefile.in | |
| parent | a965a9cb12ac9d01cb0ff114e486c63585b72999 (diff) | |
| download | jemalloc-194d6f9de8ff92841b67f38a2a6a06818e3240dd.zip jemalloc-194d6f9de8ff92841b67f38a2a6a06818e3240dd.tar.gz jemalloc-194d6f9de8ff92841b67f38a2a6a06818e3240dd.tar.bz2 | |
Restructure *CFLAGS/*CXXFLAGS configuration.
Convert CFLAGS/CXXFLAGS to be concatenations:
CFLAGS := CONFIGURE_CFLAGS SPECIFIED_CFLAGS EXTRA_CFLAGS
CXXFLAGS := CONFIGURE_CXXFLAGS SPECIFIED_CXXFLAGS EXTRA_CXXFLAGS
This ordering makes it possible to override the flags set by the
configure script both during and after configuration, with
CFLAGS/CXXFLAGS and EXTRA_CFLAGS/EXTRA_CXXFLAGS, respectively.
This resolves #504.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 22d9d86..7c1989b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -25,10 +25,14 @@ abs_objroot := @abs_objroot@ # Build parameters. CPPFLAGS := @CPPFLAGS@ -I$(srcroot)include -I$(objroot)include +CONFIGURE_CFLAGS := @CONFIGURE_CFLAGS@ +SPECIFIED_CFLAGS := @SPECIFIED_CFLAGS@ EXTRA_CFLAGS := @EXTRA_CFLAGS@ -CFLAGS := @CFLAGS@ $(EXTRA_CFLAGS) +CFLAGS := $(strip $(CONFIGURE_CFLAGS) $(SPECIFIED_CFLAGS) $(EXTRA_CFLAGS)) +CONFIGURE_CXXFLAGS := @CONFIGURE_CXXFLAGS@ +SPECIFIED_CXXFLAGS := @SPECIFIED_CXXFLAGS@ EXTRA_CXXFLAGS := @EXTRA_CXXFLAGS@ -CXXFLAGS := @CXXFLAGS@ $(EXTRA_CXXFLAGS) +CXXFLAGS := $(strip $(CONFIGURE_CXXFLAGS) $(SPECIFIED_CXXFLAGS) $(EXTRA_CXXFLAGS)) LDFLAGS := @LDFLAGS@ EXTRA_LDFLAGS := @EXTRA_LDFLAGS@ LIBS := @LIBS@ |