Changeset 295093 in webkit for trunk/Source/JavaScriptCore/offlineasm/parser.rb

Timestamp:

Jun 1, 2022, 10:04:02 AM (3 years ago)

Author:

Ryan Haddad

Message:

Revert "[Xcode] Prevent STP and other self-contained builds from overwriting content in the macOS SDK"

Unreviewed, this reverts commit 251168@main to fix internal builds.

Canonical link: ​https://commits.webkit.org/251188@main

File:

• trunk/Source/JavaScriptCore/offlineasm/parser.rb (modified) (3 diffs)

trunk/Source/JavaScriptCore/offlineasm/parser.rb

@@ -268 +268 @@
         # https://bugs.webkit.org/show_bug.cgi?id=229340
         @buildProductsDirectory = ENV['BUILT_PRODUCTS_DIR'];
-        @headersFolderPath = ENV['WK_LIBRARY_HEADERS_FOLDER_PATH'];
         @options = options
         @sources = sources
@@ -838 +837 @@
                     additionsDirectoryName = @options[:webkit_additions_path]
                 else
-                    additionsDirectoryName = "#{@buildProductsDirectory}#{@headersFolderPath}/WebKitAdditions/"
+                    additionsDirectoryName = "#{@buildProductsDirectory}/usr/local/include/WebKitAdditions/"
                 end
                 fileName = IncludeFile.new(moduleName, additionsDirectoryName).fileName
@@ -874 +873 @@
                     additionsDirectoryName = @options[:webkit_additions_path]
                 else
-                    additionsDirectoryName = "#{@buildProductsDirectory}#{@headersFolderPath}/WebKitAdditions/"
+                    additionsDirectoryName = "#{@buildProductsDirectory}/usr/local/include/WebKitAdditions/"
                 end
                 fileName = IncludeFile.new(moduleName, additionsDirectoryName).fileName