Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
Cabal
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Contributor analytics
CI/CD analytics
Repository analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Glasgow Haskell Compiler
Packages
Cabal
Commits
f10bafde
Commit
f10bafde
authored
3 years ago
by
Mikolaj Konarski
Committed by
Mikolaj Konarski
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Don't mess with PATH_SEPARATOR outside Windows
(cherry picked from commit
b4fbeebc
)
parent
30280c33
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Cabal/src/Distribution/Simple.hs
+5
-0
5 additions, 0 deletions
Cabal/src/Distribution/Simple.hs
with
5 additions
and
0 deletions
Cabal/src/Distribution/Simple.hs
+
5
−
0
View file @
f10bafde
{-# LANGUAGE CPP #-}
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE RankNTypes #-}
{-# LANGUAGE LambdaCase #-}
...
...
@@ -715,7 +716,11 @@ runConfigureScript verbosity backwardsCompatHack flags lbi = do
pathEnv
=
maybe
(
intercalate
spSep
extraPath
)
((
intercalate
spSep
extraPath
++
spSep
)
++
)
$
lookup
"PATH"
env
overEnv
=
(
"CFLAGS"
,
Just
cflagsEnv
)
:
-- TODO: Move to either Cabal/src/Distribution/Compat/Environment.hs
-- or Cabal/src/Distribution/Compat/FilePath.hs:
#
ifdef
mingw32_HOST_OS
(
"PATH_SEPARATOR"
,
Just
";"
)
:
#
endif
[(
"PATH"
,
Just
pathEnv
)
|
not
(
null
extraPath
)]
hp
=
hostPlatform
lbi
maybeHostFlag
=
if
hp
==
buildPlatform
then
[]
else
[
"--host="
++
show
(
pretty
hp
)]
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment