Commit 715b0380 authored by Mikhail Glushenkov's avatar Mikhail Glushenkov Committed by GitHub
Browse files

Merge pull request #3690 from haskell/revert-3531-issue-3512

Revert "Fix getExecutablePath on *BSD."
parents a89e5482 653a6f32
......@@ -33,7 +33,6 @@ import Foreign.Marshal.Alloc
import Foreign.Ptr
import Foreign.Storable
import System.Posix.Internals
import System.Directory
#endif
-- GHC 7.0.* compatibility. 'System.Posix.Internals' in base-4.3.* doesn't
......@@ -175,7 +174,6 @@ getExecutablePath =
-- If argc > 0 then argv[0] is guaranteed by the standard
-- to be a pointer to a null-terminated string.
then peek p_argv >>= peek >>= peekFilePath
>>= canonicalizePath
else error $ "getExecutablePath: " ++ msg
where msg = "no OS specific implementation and program name couldn't be " ++
"found in argv"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment