WebKit Bugzilla
Attachment 358107 Details for
Bug 193043
: [CMake][WTF] Finesse i386 architecture detection
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
Patch (text/plain), 1.31 KB, created by
Jim Mason
on 2018-12-27 04:18:49 PST
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Jim Mason
Created:
2018-12-27 04:18:49 PST
Size:
1.31 KB
patch
obsolete
>Index: ChangeLog >=================================================================== >--- ChangeLog (revision 239554) >+++ ChangeLog (working copy) >@@ -1,3 +1,12 @@ >+2018-12-27 Jim Mason <jmason@ibinx.com> >+ >+ [CMake][WTF] Finesse i386 architecture detection >+ https://bugs.webkit.org/show_bug.cgi?id=193043 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * CMakeLists.txt: >+ > 2018-12-19 Adrian Perez de Castro <aperez@igalia.com> > > [GTK] Cannot build with CMake <3.7 >Index: CMakeLists.txt >=================================================================== >--- CMakeLists.txt (revision 239554) >+++ CMakeLists.txt (working copy) >@@ -95,7 +95,14 @@ > elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x64|x86_64|amd64)") > set(WTF_CPU_X86_64 1) > elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)") >- set(WTF_CPU_X86 1) >+ # On some OSes, `uname -p` always reports i386 for all members >+ # of the Intel processor family, whether 32- or 64-bit. We must >+ # inspect the pointer size to determine the actual architecture. >+ if (CMAKE_SIZEOF_VOID_P MATCHES 8) >+ set(WTF_CPU_X86_64 1) >+ else () >+ set(WTF_CPU_X86 1) >+ endif () > elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc") > set(WTF_CPU_PPC 1) > elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64")
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 193043
:
358107
|
358108