Commit 313d9447 by Dirk Pranke Committed by Corentin Wallez

Stop linking a static_initializer into the Mac chromium build.

The :angle-image_util target was a source_set rather than a static_library(), causing us to link in loadimage.cpp, which pulled in mathutils.cpp, which contains a static initializer. Switching :angle_image_util to a static library (which is what GYP does) solved the problem. R=rsesek@chromium.org, cwallez@chromium.org BUG=628052 Change-Id: I63387b3fc9d799c92f7c1b49a1c7c7435e70a951 Reviewed-on: https://chromium-review.googlesource.com/360228Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org> Commit-Queue: Corentin Wallez <cwallez@chromium.org> Reviewed-by: 's avatarRobert Sesek <rsesek@chromium.org> Reviewed-by: 's avatarDirk Pranke <dpranke@chromium.org>
parent 4c32feb1
...@@ -158,7 +158,7 @@ config("angle_image_util_config") { ...@@ -158,7 +158,7 @@ config("angle_image_util_config") {
] ]
} }
source_set("angle_image_util") { static_library("angle_image_util") {
sources = rebase_path(gles_gypi.libangle_image_util_sources, ".", "src") sources = rebase_path(gles_gypi.libangle_image_util_sources, ".", "src")
configs -= angle_undefine_configs configs -= angle_undefine_configs
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment