From 7d52be028d06dfdb6bdddc1665b4184152d19d4e Mon Sep 17 00:00:00 2001 From: Frank Henigman Date: Thu, 24 Mar 2016 14:40:58 -0400 Subject: [PATCH] Move -lrt where it belongs. Only deqp uses librt so the dependency belongs there, not in util.gyp, and the condition should be OS==linux, not use_x11. This lets things work on Chrome OS. BUG=angleproject:1297 Change-Id: If397da5463b9c2d5217eb3b20841fa5a44bf56a3 Reviewed-on: https://chromium-review.googlesource.com/334813 Reviewed-by: Corentin Wallez Reviewed-by: Geoff Lang Commit-Queue: Frank Henigman --- src/tests/deqp.gypi | 7 +++++++ util/util.gyp | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/tests/deqp.gypi b/src/tests/deqp.gypi index 796fd9052..e4a91c8b1 100644 --- a/src/tests/deqp.gypi +++ b/src/tests/deqp.gypi @@ -1380,6 +1380,13 @@ { 'sources': [ '<@(deqp_libtester_sources_unix)', ], }], + ['OS=="linux"', + { + 'link_settings': + { + 'libraries': ['-lrt'] + }, + }], ], }, diff --git a/util/util.gyp b/util/util.gyp index 1fdb88ca2..c29fffca2 100644 --- a/util/util.gyp +++ b/util/util.gyp @@ -158,7 +158,7 @@ ], 'libraries': [ - '