Skip to content

common: Fix suffix #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rocketprogrammer wants to merge 2 commits into
base: master
Choose a base branch
from
Open

common: Fix suffix #14

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff2f21c
common: Fix suffix
Jan 20, 2021
a1c9eb2
common: Take character regardless of suffix end
Jan 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions scripts/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,9 +340,8 @@ def get_win_thirdparty_dir():
""" Returns the path of the thirdparty directory, windows only """
msvc_suffix = get_panda_msvc_version().suffix

# The thirdparty directory is named "vc14" for example instead of "vc140"
if msvc_suffix.endswith("0"):
msvc_suffix = msvc_suffix[:-1]
# The thirdparty directory is named "vc14" for example instead of "vc142"
msvc_suffix = msvc_suffix[:-1]

bit_suffix = "-x64" if is_64_bit() else ""
full_suffix = "-" + msvc_suffix + bit_suffix
Expand Down