Title: [292433] trunk/Source/WebKitLegacy
- Revision
- 292433
- Author
- e...@apple.com
- Date
- 2022-04-05 15:33:54 -0700 (Tue, 05 Apr 2022)
Log Message
Fix STP build error "no such file or directory: 'Technology'"
https://bugs.webkit.org/show_bug.cgi?id=238834
<rdar://91271288>
Reviewed by Alexey Proskuryakov.
* scripts/migrate-header-rule: Don't generate an export list when
building for Mac. We won't use it, and this script does not support
paths in FRAMEWORK_SEARCH_PATHS containing spaces.
Modified Paths
Diff
Modified: trunk/Source/WebKitLegacy/ChangeLog (292432 => 292433)
--- trunk/Source/WebKitLegacy/ChangeLog 2022-04-05 22:31:41 UTC (rev 292432)
+++ trunk/Source/WebKitLegacy/ChangeLog 2022-04-05 22:33:54 UTC (rev 292433)
@@ -1,3 +1,15 @@
+2022-04-05 Elliott Williams <e...@apple.com>
+
+ Fix STP build error "no such file or directory: 'Technology'"
+ https://bugs.webkit.org/show_bug.cgi?id=238834
+ <rdar://91271288>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * scripts/migrate-header-rule: Don't generate an export list when
+ building for Mac. We won't use it, and this script does not support
+ paths in FRAMEWORK_SEARCH_PATHS containing spaces.
+
2022-04-04 Elliott Williams <e...@apple.com>
[XCBuild] WebKitLegacy's "Migrated headers" script does not emit task information
Modified: trunk/Source/WebKitLegacy/scripts/migrate-header-rule (292432 => 292433)
--- trunk/Source/WebKitLegacy/scripts/migrate-header-rule 2022-04-05 22:31:41 UTC (rev 292432)
+++ trunk/Source/WebKitLegacy/scripts/migrate-header-rule 2022-04-05 22:33:54 UTC (rev 292433)
@@ -6,7 +6,10 @@
# Create a forwarding header to make all imports of this header use WebKitLegacy's header map.
echo "#import <WebKitLegacy/${INPUT_FILE_NAME}>" > "${SCRIPT_OUTPUT_FILE_1}"
+if [ ${WK_PLATFORM_NAME} != macosx ]; then
+
# *_SEARCH_PATHS are already shell-escaped, convert to an array so we can pass a flag for each path.
+# Note that this method does not work for search paths which contain spaces (rdar://91303280).
eval HEADER_SEARCH_PATHS=(${HEADER_SEARCH_PATHS} ${SYSTEM_HEADER_SEARCH_PATHS})
eval FRAMEWORK_SEARCH_PATHS=(${FRAMEWORK_SEARCH_PATHS} ${SYSTEM_FRAMEWORK_SEARCH_PATHS})
@@ -13,5 +16,10 @@
# Create an export list, which will be used by "Generate Export Files" to make the
# EXPORTED_SYMBOLS_FILE passes to the linker.
for WK_CURRENT_ARCH in ${ARCHS}; do
- tapi reexport -target ${WK_CURRENT_ARCH}-${LLVM_TARGET_TRIPLE_VENDOR}-${LLVM_TARGET_TRIPLE_OS_VERSION}${LLVM_TARGET_TRIPLE_SUFFIX} -isysroot ${SDK_DIR} -I${BUILT_PRODUCTS_DIR} ${HEADER_SEARCH_PATHS[@]/#/-I} -F${BUILT_PRODUCTS_DIR} ${FRAMEWORK_SEARCH_PATHS[@]/#/-F} -DWEBCORE_EXPORT= "${SDK_DIR}/usr/include/TargetConditionals.h" "${INPUT_FILE_PATH}" -o /dev/stdout
+ tapi reexport -target ${WK_CURRENT_ARCH}-${LLVM_TARGET_TRIPLE_VENDOR}-${LLVM_TARGET_TRIPLE_OS_VERSION}${LLVM_TARGET_TRIPLE_SUFFIX} -isysroot ${SDK_DIR} -I${BUILT_PRODUCTS_DIR} ${HEADER_SEARCH_PATHS[@]/#/-I} -F${BUILT_PRODUCTS_DIR} ${FRAMEWORK_SEARCH_PATHS[@]/#/-F} -DWEBCORE_EXPORT= "${SDK_DIR}/usr/include/TargetConditionals.h" "${INPUT_FILE_PATH}" -o /dev/stdout
done > "${SCRIPT_OUTPUT_FILE_2}"
+
+else
+# Mac platforms don't use this export list.
+touch "${SCRIPT_OUTPUT_FILE_2}"
+fi
\ No newline at end of file
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
