diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-12-31 14:36:55 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-12-31 14:36:55 -0400 |
| commit | bd1aa04396eb710a06d02ac5a3f4614db95c3b93 (patch) | |
| tree | 736b168a50764fbc6357752c0113ea39fcf96c1e | |
| parent | 0325ffaee1000a4ae0bd04059df88c4d3ce5fca3 (diff) | |
Revert "include libgcc in linux standalone"
This reverts commit 90a28ca0ff7123cd939c90930dec6479da6bd136.
ldd pulls it in
| -rw-r--r-- | Build/LinuxMkLibs.hs | 2 | ||||
| -rw-r--r-- | doc/bugs/Assistant_from_standalone_5.20131230_64bit_crashes_on_startup.mdwn | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/Build/LinuxMkLibs.hs b/Build/LinuxMkLibs.hs index 74641d811..6c89216bf 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 aff2b3343..61862a099 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]] |