Fix Linux standalone compilation.

simple_texture_2d, hello_triangle, stencil_operations, simple_texture_cubemap fail to compile after https://chromium-review.googlesource.com/342050. BUG=angleproject:1319 TEST=ninja -C out/Release all Change-Id: Ib70008036f8688b737f3f40b5224437a7afdea19 Reviewed-on: https://chromium-review.googlesource.com/346121Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Yuly Novikov <ynovikov@chromium.org>

Fix Linux standalone compilation.
87ae8cdf · Yuly Novikov · Commit Bot · 771f307f · 87ae8cdf · 87ae8cdf
Commit 87ae8cdf authored May 19, 2016 by Yuly Novikov Committed by Commit Bot May 20, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 5 deletions

BUILD.gn BUILD.gn +8 -5

util.gyp util/util.gyp +7 -0

No files found.
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -117,7 +117,9 @@ static_library("angle_common") {
    "//build/config/compiler:no_chromium_code",
  ]
-  public_deps = [ ":commit_id" ]
+  public_deps = [
+    ":commit_id",
+  ]
 }
 static_library("translator_lib") {
@@ -290,9 +292,7 @@ static_library("libANGLE") {
    }
    if (use_x11) {
      sources += rebase_path(gles_gypi.libangle_gl_glx_sources, ".", "src")
-      deps += [
+      deps += [ "src/third_party/libXNVCtrl:libXNVCtrl" ]
-        "src/third_party/libXNVCtrl:libXNVCtrl"
-      ]
      libs += [
        "X11",
        "Xi",
@@ -398,7 +398,10 @@ static_library("angle_util") {
  if (is_linux) {
    sources += rebase_path(util_gypi.util_linux_sources, ".", "util")
-    libs = [ "rt" ]
+    libs = [
+      "rt",
+      "dl",
+    ]
  }
  if (is_mac) {

--- a/util/util.gyp
+++ b/util/util.gyp
@@ -149,6 +149,13 @@
                    [
                        '<@(util_linux_sources)',
                    ],
+                    'link_settings':
+                    {
+                        'libraries':
+                        [
+                            '-ldl',
+                        ],
+                    },
                }],
                ['use_x11==1',
                {