summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-12-31 14:23:49 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-12-31 14:23:49 -0400
commit90a28ca0ff7123cd939c90930dec6479da6bd136 (patch)
tree20c8ad8789414ad215b7f75902bc77946353a444
parent5e8c6b1006861ec24d9405af5006674b24efecba (diff)
include libgcc in linux standalone
-rw-r--r--Build/LinuxMkLibs.hs2
-rw-r--r--doc/bugs/Assistant_from_standalone_5.20131230_64bit_crashes_on_startup.mdwn2
2 files changed, 3 insertions, 1 deletions
diff --git a/Build/LinuxMkLibs.hs b/Build/LinuxMkLibs.hs
index 6c89216bf..74641d811 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 | egrep '\\.so|gconv'"]
+ ["-c", "dpkg -L libc6 libgcc1 | 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 61862a099..aff2b3343 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,3 +27,5 @@ 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]]