Skip to content

Commit 477f7b3

Browse files
naveen521kklazka
authored andcommitted
Don't convert sysconfig.get_config_var('VPATH') to an absolute path
this is required for venv to work properly
1 parent c8b3428 commit 477f7b3

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

Makefile.pre.in

-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ datarootdir= @datarootdir@
145145

146146
# Locations needed for semi-native fixup of sysconfig.
147147
srcdir_b2h= @srcdir_b2h@
148-
VPATH_b2h= @VPATH_b2h@
149148
abs_srcdir_b2h= @abs_srcdir_b2h@
150149
abs_builddir_b2h= @abs_builddir_b2h@
151150
prefix_b2h= @prefix_b2h@

configure.ac

+1-9
Original file line numberDiff line numberDiff line change
@@ -746,12 +746,8 @@ fi
746746
# without setting up the same env and also that the build of Python
747747
# itself will fail as the paths are not correct for the host tools.
748748
#
749-
# Also, getpath.c uses GetModuleFileNameW (replacing \ with /) and
750-
# compares that with the define VPATH (passed in via command-line)
751-
# to determine whether it's the build- or the installed-Python.
752-
#
753749
# To work around these issues a set of _b2h variables are created:
754-
# VPATH_b2h, prefix_b2h, srcdir_b2h, abs_srcdir_b2h
750+
# prefix_b2h, srcdir_b2h, abs_srcdir_b2h
755751
# and abs_builddir_b2h
756752
# .. where b2h stands for build to host. sysconfig.py replaces path
757753
# prefixes matching the non-b2h versions with the b2h equivalents.
@@ -778,10 +774,6 @@ AC_DEFUN([ABS_PATH_HOST],
778774
AC_SUBST([$1])
779775
])
780776

781-
AC_MSG_CHECKING(absolute host location of VPATH)
782-
ABS_PATH_HOST([VPATH_b2h],[srcdir])
783-
AC_MSG_RESULT([$VPATH_b2h])
784-
785777
AC_MSG_CHECKING(absolute host location of prefix)
786778
ABS_PATH_HOST([prefix_b2h],[prefix])
787779
AC_MSG_RESULT([$prefix_b2h])

0 commit comments

Comments
 (0)