Patch #786737: Allow building in a tree of symlinks pointing to

a readonly source.

diff --git a/Makefile.pre.in b/Makefile.pre.in
index d2250bb16765d80ea69a899b5c21f8941cc68814..078f2d9025b5fd289eabde37a2f49e0fa933d62f 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -61,7 +61,7 @@ CFLAGS=               $(BASECFLAGS) $(OPT) $(EXTRA_CFLAGS)
 # 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
-CPPFLAGS=      -I. -I$(srcdir)/Include @CPPFLAGS@
+CPPFLAGS=      -I. -IInclude -I$(srcdir)/Include @CPPFLAGS@
 LDFLAGS=       @LDFLAGS@
 LDLAST=                @LDLAST@
 SGI_ABI=       @SGI_ABI@
@@ -470,6 +470,7 @@ Modules/python.o: $(srcdir)/Modules/python.c
 
 
 $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)
+               -@ mkdir Include
                -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
 
 $(PGEN):       $(PGENOBJS)

diff --git a/Misc/NEWS b/Misc/NEWS
index d397a5c15b7f53a623e21a7956c581f495f2afdc..214611bd04ea49582884f819549f0370fc0b7f6d 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -122,6 +122,9 @@ Documentation
 Build
 -----
 
+- Patch #786737: Allow building in a tree of symlinks pointing to
+  a readonly source.
+
 - Bug #1737210: Change Manufacturer of Windows installer to PSF.
 
 - Bug #1746880: Correctly install DLLs into system32 folder on Win64.

diff --git a/Modules/makesetup b/Modules/makesetup
index bc1b1b9151732472ad4ac630262d1b663da7d18f..8862c36e7b282566d5ccc953b28af12cbfa3a97f 100755 (executable)
--- a/Modules/makesetup
+++ b/Modules/makesetup
@@ -238,7 +238,7 @@ sed -e 's/[         ]*#.*//' -e '/^[        ]*$/d' |
                        no)     SHAREDMODS="$SHAREDMODS $file";;
                        esac
                        rule="$file: $objs"
-                       rule="$rule; \$(LDSHARED) $objs $libs $ExtraLibs -o $file"
+                       rule="$rule; \$(BLDSHARED) $objs $libs $ExtraLibs -o $file"
                        echo "$rule" >>$rulesf
                done
        done