Skip to content

Commit 327f9ba

Browse files
authored
fix(metadata-generator): handle spaces in xcode path by appending the paths directly post split (#344)
1 parent 030b9b0 commit 327f9ba

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

metadata-generator/build-step-metadata-generator.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,10 @@ def map_and_list(func, iterable):
8989
std = env("GCC_C_LANGUAGE_STANDARD")
9090
header_search_paths = env_or_empty("HEADER_SEARCH_PATHS")
9191
header_search_paths_parsed = map_and_list((lambda s: "-I" + s), shlex.split(header_search_paths))
92-
framework_search_paths = env_or_empty("FRAMEWORK_SEARCH_PATHS")
92+
framework_search_paths = shlex.split(env_or_empty("FRAMEWORK_SEARCH_PATHS"))
9393
# Add extra framework search path for newer Xcode versions
94-
extra_framework_path = os.path.join(sdk_root, "System/Library/SubFrameworks")
95-
if framework_search_paths:
96-
framework_search_paths += " " + extra_framework_path
97-
else:
98-
framework_search_paths = extra_framework_path
99-
framework_search_paths_parsed = map_and_list((lambda s: "-F" + s), shlex.split(framework_search_paths))
94+
framework_search_paths.append(os.path.join(sdk_root, "System/Library/SubFrameworks"))
95+
framework_search_paths_parsed = map_and_list((lambda s: "-F" + s), framework_search_paths)
10096
other_cflags = env_or_empty("OTHER_CFLAGS")
10197
other_cflags_parsed = shlex.split(other_cflags)
10298
enable_modules = env_bool("CLANG_ENABLE_MODULES")

0 commit comments

Comments
 (0)