From 114270ed1c41f66636bea24ac8ccaac8133aa505 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Wed, 17 Oct 2018 16:13:17 +0300 Subject: [PATCH] Move defining use_custom_libcxx to %build --- chromium-browser-stable.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/chromium-browser-stable.spec b/chromium-browser-stable.spec index d67734f..f983b03 100644 --- a/chromium-browser-stable.spec +++ b/chromium-browser-stable.spec @@ -352,6 +352,8 @@ cmp $FILE $FILE.orig && exit 1 mkdir -p third_party/node/linux/node-linux-x64/bin ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/node +%build + # If system glibc is too old, use Chromium's built-in libc++, otherwise use system libc++. # Shell does not or may not understand not integer values correctly, # so remove the dot by sed to make the value of the glibc version an integer. @@ -370,7 +372,6 @@ echo "DEBUG: use_custom_libcxx = ${use_custom_libcxx}" %define use_custom_libcxx_macro %(cat %{use_custom_libcxx_macro_tmpfile}) rm -fv %{use_custom_libcxx_macro_tmpfile} -%build %define use_gold true %if 0%{clang} %define is_clang true