Skip to content

Commit

Permalink
Don't convert sysconfig.get_config_var('VPATH') to an absolute path
Browse files Browse the repository at this point in the history
this is required for venv to work properly
  • Loading branch information
naveen521kk authored and lazka committed Jul 19, 2023
1 parent c8b3428 commit 477f7b3
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 10 deletions.
1 change: 0 additions & 1 deletion Makefile.pre.in
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,6 @@ datarootdir= @datarootdir@

# Locations needed for semi-native fixup of sysconfig.
srcdir_b2h= @srcdir_b2h@
VPATH_b2h= @VPATH_b2h@
abs_srcdir_b2h= @abs_srcdir_b2h@
abs_builddir_b2h= @abs_builddir_b2h@
prefix_b2h= @prefix_b2h@
Expand Down
10 changes: 1 addition & 9 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -746,12 +746,8 @@ fi
# without setting up the same env and also that the build of Python
# itself will fail as the paths are not correct for the host tools.
#
# Also, getpath.c uses GetModuleFileNameW (replacing \ with /) and
# compares that with the define VPATH (passed in via command-line)
# to determine whether it's the build- or the installed-Python.
#
# To work around these issues a set of _b2h variables are created:
# VPATH_b2h, prefix_b2h, srcdir_b2h, abs_srcdir_b2h
# prefix_b2h, srcdir_b2h, abs_srcdir_b2h
# and abs_builddir_b2h
# .. where b2h stands for build to host. sysconfig.py replaces path
# prefixes matching the non-b2h versions with the b2h equivalents.
Expand All @@ -778,10 +774,6 @@ AC_DEFUN([ABS_PATH_HOST],
AC_SUBST([$1])
])

AC_MSG_CHECKING(absolute host location of VPATH)
ABS_PATH_HOST([VPATH_b2h],[srcdir])
AC_MSG_RESULT([$VPATH_b2h])

AC_MSG_CHECKING(absolute host location of prefix)
ABS_PATH_HOST([prefix_b2h],[prefix])
AC_MSG_RESULT([$prefix_b2h])
Expand Down

0 comments on commit 477f7b3

Please sign in to comment.