Changeset 145574 in webkit

Timestamp:

Mar 12, 2013 12:43:41 PM (11 years ago)

Author:

gavinp@chromium.org

Message:

[chromium] Use lipo(1) rather than file(1) to list library architectures.
​https://bugs.webkit.org/show_bug.cgi?id=111147

Parsing file(1) output can be fragile; this patch replaces a use of file(1) to get
the architecture list of a library with an invocation of lipo(1), which should be more
stable.

Reviewed by Nico Weber.

No new tests, since adjust_visibility.sh doesn't have a test.

• WebCore.gyp/mac/adjust_visibility.sh:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.gyp/mac/adjust_visibility.sh (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-12  Gavin Peters  <gavinp@chromium.org>
+
+        [chromium] Use lipo(1) rather than file(1) to list library architectures.
+        https://bugs.webkit.org/show_bug.cgi?id=111147
+
+        Parsing file(1) output can be fragile; this patch replaces a use of file(1) to get
+        the architecture list of a library with an invocation of lipo(1), which should be more
+        stable.
+
+        Reviewed by Nico Weber.
+
+        No new tests, since adjust_visibility.sh doesn't have a test.
+
+        * WebCore.gyp/mac/adjust_visibility.sh:
+
 2013-03-12  Viatcheslav Ostapenko  <sl.ostapenko@samsung.com>
 

trunk/Source/WebCore/WebCore.gyp/mac/adjust_visibility.sh

@@ -56 +56 @@
 # ar doesn't operate on fat files.  Figure out what architectures are
 # involved.
-ARCHS=$(file "${INPUT}" | sed -Ene 's/^.*\(for architecture (.+)\):.*$/\1/p')
+ARCHS=$(lipo -info "${INPUT}" | sed -Ene 's/^.* are: (.+)/\1/p')
 if [ -z "${ARCHS}" ] ; then
   ARCHS=self