Skip to content

Commit ea85084

Browse files
authored
Remove unused function. NFC (#1661)
The usage of this function was removed in #1177.
1 parent 6639943 commit ea85084

1 file changed

Lines changed: 2 additions & 15 deletions

File tree

emsdk.py

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -270,16 +270,6 @@ def vswhere(version):
270270
return ''
271271

272272

273-
def vs_filewhere(installation_path, platform, file):
274-
try:
275-
vcvarsall = os.path.join(installation_path, 'VC\\Auxiliary\\Build\\vcvarsall.bat')
276-
env = subprocess.check_output('cmd /c "%s" %s & where %s' % (vcvarsall, platform, file))
277-
paths = [path[:-len(file)] for path in env.split('\r\n') if path.endswith(file)]
278-
return paths[0]
279-
except Exception:
280-
return ''
281-
282-
283273
CMAKE_GENERATOR = 'Unix Makefiles'
284274
if WINDOWS:
285275
# Detect which CMake generator to use when building on Windows
@@ -1035,12 +1025,9 @@ def cmake_configure(generator, build_root, src_root, build_type, extra_cmake_arg
10351025
# Create build output directory if it doesn't yet exist.
10361026
os.mkdir(build_root)
10371027
try:
1028+
cmdline = [find_cmake(), '-DCMAKE_BUILD_TYPE=' + build_type, '-DPYTHON_EXECUTABLE=' + sys.executable]
10381029
if generator:
1039-
generator = ['-G', generator]
1040-
else:
1041-
generator = []
1042-
1043-
cmdline = [find_cmake()] + generator + ['-DCMAKE_BUILD_TYPE=' + build_type, '-DPYTHON_EXECUTABLE=' + sys.executable]
1030+
cmdline += ['-G', generator]
10441031
# Target macOS 11.0 Big Sur at minimum, to support older Mac devices.
10451032
# See https://en.wikipedia.org/wiki/MacOS#Hardware_compatibility for min-spec details.
10461033
cmdline += ['-DCMAKE_OSX_DEPLOYMENT_TARGET=11.0']

0 commit comments

Comments
 (0)