Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8283)

Unified Diff: chrome/installer/linux/rpm/build.sh

Issue 2963223003: Reland of Switch Chrome on Linux to libc++ (Closed)
Patch Set: Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/installer/linux/rpm/build.sh
diff --git a/chrome/installer/linux/rpm/build.sh b/chrome/installer/linux/rpm/build.sh
index 3714091f0a9f962e7523f6b246181cbdf3fa011a..3a7d7f0d3fe78ec705e59b87e1b7522289f61ac1 100755
--- a/chrome/installer/linux/rpm/build.sh
+++ b/chrome/installer/linux/rpm/build.sh
@@ -90,7 +90,7 @@
fi
# Use find-requires script to make sure the dependencies are complete
- # (especially libc and libstdc++ versions).
+ # (especially libc versions).
DETECTED_DEPENDS="$(echo "${BUILDDIR}/chrome" | /usr/lib/rpm/find-requires)"
# Compare the expected dependency list to the generated list.
@@ -127,8 +127,6 @@
# libssl3.so, force the dependency on libssl3 to ensure the NSS version is
# 3.28 or later, since libssl3 should always be packaged with libnss3.
#
- # libstdc++.so.6 is for C++11 support.
- #
# wget is for uploading crash reports with Breakpad.
#
# xdg-utils is still optional in LSB 4.0.
@@ -149,7 +147,6 @@
DEPENDS="lsb >= 4.0, \
libnss3.so(NSS_3.22)${PKG_ARCH}, \
libssl3.so(NSS_3.28)${PKG_ARCH}, \
- libstdc++.so.6(GLIBCXX_3.4.18)${PKG_ARCH}, \
wget, \
xdg-utils, \
zlib, \
« no previous file with comments | « chrome/installer/linux/debian/expected_deps_x64_jessie ('k') | chrome/installer/linux/rpm/expected_deps_i386 » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698