commit caf54c5c5bc1c89359c7aa5c3e784c1ce2da6989
author Petr Hosek <phosek@google.com> Thu Jan 03 14:24:56 2019 -0800
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Fri Jan 04 01:27:22 2019 +0000
tree 6625833c2bf40802beb9ad093450fa56dca10a83
parent 71a84f12a52958a585dc7ae0c123a31e54d28c68

[rust] Fix build ID flag setup for Linux targets

GNU/Linux targets end with "linux-gnu", not just "linux".

Test: CQ

Change-Id: Ia44f01c8db6a9cb4033226735982abbce4e4fd15

rust/build_rustc_target.py

diff --git a/rust/build_rustc_target.py b/rust/build_rustc_target.py
index 084bd98..6d71da4 100755
--- a/rust/build_rustc_target.py
+++ b/rust/build_rustc_target.py
@@ -188,7 +188,7 @@
         ]
         if args.target.startswith("aarch64"):
             call_args += ["-Clink-arg=-Wl,--fix-cortex-a53-843419"]
-        if args.target.endswith("linux"):
+        if args.target.endswith("linux-gnu"):
             call_args += [
                 "-Clink-arg=-Wl,--build-id",
                 "-Clink-arg=-Wl,--hash-style=gnu",

rust/compile_3p_crates.py

diff --git a/rust/compile_3p_crates.py b/rust/compile_3p_crates.py
index 0f7a01c..3efbecb 100755
--- a/rust/compile_3p_crates.py
+++ b/rust/compile_3p_crates.py
@@ -120,8 +120,8 @@
     else:
         if args.target.startswith("aarch64"):
             rustflags += ["-Clink-arg=-Wl,--fix-cortex-a53-843419"]
-        if args.target.endswith("linux"):
-            call_args += [
+        if args.target.endswith("linux-gnu"):
+            rustflags += [
                 "-Clink-arg=-Wl,--build-id",
                 "-Clink-arg=-Wl,--hash-style=gnu",
             ]