diff options
| author | doko@python.org <doko@python.org> | 2013-01-25 12:20:46 (GMT) |
|---|---|---|
| committer | doko@python.org <doko@python.org> | 2013-01-25 12:20:46 (GMT) |
| commit | 6951fea3abb64a3820d623efce182fefdcbae978 (patch) | |
| tree | 3aa2c832db8a43b2d274737f1452f538d4f5a60c /Makefile.pre.in | |
| parent | 35f284b75e7c4e35c57575b8839efc15fc12daad (diff) | |
| parent | 0c77bf757f94945b9e11a3d1f44ee47466866fd0 (diff) | |
| download | cpython-6951fea3abb64a3820d623efce182fefdcbae978.zip cpython-6951fea3abb64a3820d623efce182fefdcbae978.tar.gz cpython-6951fea3abb64a3820d623efce182fefdcbae978.tar.bz2 | |
- Issue #17029: Let h2py search the multiarch system include directory.
Diffstat (limited to 'Makefile.pre.in')
| -rw-r--r-- | Makefile.pre.in | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 97bb005..8297004 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -97,6 +97,9 @@ PY_CORE_CFLAGS= $(PY_CFLAGS) $(PY_CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE # Machine-dependent subdirectories MACHDEP= @MACHDEP@ +# Multiarch directory (may be empty) +MULTIARCH= @MULTIARCH@ + # Install prefix for architecture-independent files prefix= @prefix@ @@ -1119,6 +1122,7 @@ $(srcdir)/Lib/$(PLATDIR): export PYTHONPATH; PYTHONPATH="`pwd`/Lib"; \ export DYLD_FRAMEWORK_PATH; DYLD_FRAMEWORK_PATH="`pwd`"; \ export EXE; EXE="$(BUILDEXE)"; \ + if [ -n "$(MULTIARCH)" ]; then export MULTIARCH; MULTIARCH=$(MULTIARCH); fi; \ cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen python-config: $(srcdir)/Misc/python-config.in |