Bug 1694845 - Follow-up: Fix formatting. rs=mozlint DONTBUILD
authorRob Lemley <rob@thunderbird.net>
Wed, 03 Mar 2021 11:50:55 -0500
changeset 31838 e580680570ab258f3dd90ad1171fb887097f7ab7
parent 31837 d753b6013e03421b1c816e8bc810dc808e221b2b
child 31839 1d767781ecbaf30a720aa0dd0798f17865255dad
push id18524
push userthunderbird@calypsoblue.org
push dateWed, 03 Mar 2021 17:11:41 +0000
treeherdercomm-central@e580680570ab [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmozlint
bugs1694845
Bug 1694845 - Follow-up: Fix formatting. rs=mozlint DONTBUILD
third_party/rnpdefs.mozbuild
--- a/third_party/rnpdefs.mozbuild
+++ b/third_party/rnpdefs.mozbuild
@@ -28,20 +28,16 @@ if CONFIG["CC_TYPE"] == "clang-cl":
     ]
     USE_STATIC_LIBS = True
 
 # MOZ_LIBSTDCXX_TARGET_VERSION should only be set for Taskcluster builds
 # targeting Linux. The below changes those builds to statically link to
 # LLVM's libc++ statically to circumvent the issues with undesired libstdc++
 # symbols that keep popping up
 if CONFIG["MOZ_LIBSTDCXX_TARGET_VERSION"]:
-    static_libdir = {"i686": "-L{}/../lib32",
-                     "x86_64": "-L{}"}[CONFIG["TARGET_CPU"]].format(
-        CONFIG["MOZ_LIBCLANG_PATH"])
+    static_libdir = {"i686": "-L{}/../lib32", "x86_64": "-L{}"}[
+        CONFIG["TARGET_CPU"]
+    ].format(CONFIG["MOZ_LIBCLANG_PATH"])
 
     DEFINES["_GLIBCXX_USE_CXX11_ABI"] = 0
     CXXFLAGS += ["-stdlib=libc++"]
     LDFLAGS += ["-nostdlib++"]
-    OS_LIBS += [
-        static_libdir,
-        "-l:libc++.a",
-        "-l:libc++abi.a"
-    ]
+    OS_LIBS += [static_libdir, "-l:libc++.a", "-l:libc++abi.a"]