From 72b592cdaedce26791d0089bbfcc6e4711eb541a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 31 Dec 2013 14:36:55 -0400 Subject: [PATCH] Revert "include libgcc in linux standalone" This reverts commit 9f82e0c64d62e1d92b8731e603ecfcfb94bae7b4. ldd pulls it in --- Build/LinuxMkLibs.hs | 2 +- ...ant_from_standalone_5.20131230_64bit_crashes_on_startup.mdwn | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Build/LinuxMkLibs.hs b/Build/LinuxMkLibs.hs index 74641d811a..6c89216bf9 100644 --- a/Build/LinuxMkLibs.hs +++ b/Build/LinuxMkLibs.hs @@ -141,4 +141,4 @@ parseLdd = catMaybes . map (getlib . dropWhile isSpace) . lines - XXX Debian specific. -} glibcLibs :: IO [FilePath] glibcLibs = lines <$> readProcess "sh" - ["-c", "dpkg -L libc6 libgcc1 | egrep '\\.so|gconv'"] + ["-c", "dpkg -L libc6 | egrep '\\.so|gconv'"] diff --git a/doc/bugs/Assistant_from_standalone_5.20131230_64bit_crashes_on_startup.mdwn b/doc/bugs/Assistant_from_standalone_5.20131230_64bit_crashes_on_startup.mdwn index aff2b3343b..61862a0991 100644 --- a/doc/bugs/Assistant_from_standalone_5.20131230_64bit_crashes_on_startup.mdwn +++ b/doc/bugs/Assistant_from_standalone_5.20131230_64bit_crashes_on_startup.mdwn @@ -27,5 +27,3 @@ The assistant from the standalone 64bit build crashes upon startup. [134 zerodogg@firefly annexed]$ ls -l /usr/lib64/libgcc_s.so.1 lrwxrwxrwx. 1 root root 28 2013-12-18 10:54 /usr/lib64/libgcc_s.so.1 -> libgcc_s-4.8.2-20131212.so.1 [0 zerodogg@firefly annexed]$ - -> I guess I need to include libgcc in the bundle. [[done]] --[[Joey]]