diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-08-10 03:04:19 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-08-10 03:04:19 (GMT) |
| commit | b30802b7a8a6e653e098cdb0108a729700e9eaaa (patch) | |
| tree | 69149308a8227b2387c6e21c2e99cbfffe785fd9 /Makefile.pre.in | |
| parent | a61d058bf97291a51cc6481a3e76c2aa5500b37c (diff) | |
| parent | acb8c5234302f8057b331abaafb2cc8697daf58f (diff) | |
| download | cpython-b30802b7a8a6e653e098cdb0108a729700e9eaaa.zip cpython-b30802b7a8a6e653e098cdb0108a729700e9eaaa.tar.gz cpython-b30802b7a8a6e653e098cdb0108a729700e9eaaa.tar.bz2 | |
merge 3.4 (#21121)
Diffstat (limited to 'Makefile.pre.in')
| -rw-r--r-- | Makefile.pre.in | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 03875ef..848cf95 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -71,12 +71,17 @@ OPT= @OPT@ BASECFLAGS= @BASECFLAGS@ BASECPPFLAGS= @BASECPPFLAGS@ CONFIGURE_CFLAGS= @CFLAGS@ +# CFLAGS_NODIST is used for building the interpreter and stdlib C extensions. +# Use it when a compiler flag should _not_ be part of the distutils CFLAGS +# once Python is installed (Issue #21121). +CONFIGURE_CFLAGS_NODIST=@CFLAGS_NODIST@ CONFIGURE_CPPFLAGS= @CPPFLAGS@ CONFIGURE_LDFLAGS= @LDFLAGS@ # Avoid assigning CFLAGS, LDFLAGS, etc. so users can use them on the # command line to append to these values without stomping the pre-set # values. PY_CFLAGS= $(BASECFLAGS) $(OPT) $(CONFIGURE_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) +PY_CFLAGS_NODIST=$(CONFIGURE_CFLAGS_NODIST) $(CFLAGS_NODIST) # Both CPPFLAGS and LDFLAGS need to contain the shell's value for setup.py to # be able to build extension modules using the directories specified in the # environment variables @@ -91,7 +96,7 @@ ARFLAGS= @ARFLAGS@ # Extra C flags added for building the interpreter object files. CFLAGSFORSHARED=@CFLAGSFORSHARED@ # C flags used for building the interpreter object files -PY_CORE_CFLAGS= $(PY_CFLAGS) $(PY_CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE +PY_CORE_CFLAGS= $(PY_CFLAGS) $(PY_CFLAGS_NODIST) $(PY_CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE # Machine-dependent subdirectories |