Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
ghcup-hs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue 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
Haskell
ghcup-hs
Commits
09a8a0bd
Verified
Commit
09a8a0bd
authored
3 years ago
by
Julian Ospald
Browse files
Options
Downloads
Patches
Plain Diff
Fix build on windows and stack
parent
191f49ad
No related branches found
Branches containing commit
No related tags found
1 merge request
!238
Implement 'ghcup run'
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/ghcup/GHCup/OptParse/Run.hs
+5
-3
5 additions, 3 deletions
app/ghcup/GHCup/OptParse/Run.hs
ghcup.cabal
+3
-0
3 additions, 0 deletions
ghcup.cabal
with
8 additions
and
3 deletions
app/ghcup/GHCup/OptParse/Run.hs
+
5
−
3
View file @
09a8a0bd
...
@@ -205,9 +205,11 @@ run RunOptions{..} runAppState runLogger = runRUN runAppState (do
...
@@ -205,9 +205,11 @@ run RunOptions{..} runAppState runLogger = runRUN runAppState (do
[]
->
liftIO
$
putStr
tmp
[]
->
liftIO
$
putStr
tmp
(
cmd
:
args
)
->
do
(
cmd
:
args
)
->
do
newEnv
<-
liftIO
$
addToPath
tmp
newEnv
<-
liftIO
$
addToPath
tmp
if
isWindows
#
ifndef
IS_WINDOWS
then
liftE
$
lEM
@
_
@
'
[
ProcessError
]
$
exec
cmd
args
Nothing
(
Just
newEnv
)
liftIO
$
SPP
.
executeFile
cmd
True
args
(
Just
newEnv
)
else
liftIO
$
SPP
.
executeFile
cmd
True
args
(
Just
newEnv
)
#
else
liftE
$
lEM
@
_
@
'
[
ProcessError
]
$
exec
cmd
args
Nothing
(
Just
newEnv
)
#
endif
pure
()
pure
()
)
>>=
\
case
)
>>=
\
case
VRight
_
->
do
VRight
_
->
do
...
...
This diff is collapsed.
Click to expand it.
ghcup.cabal
+
3
−
0
View file @
09a8a0bd
...
@@ -267,6 +267,9 @@ executable ghcup
...
@@ -267,6 +267,9 @@ executable ghcup
if os(windows)
if os(windows)
cpp-options: -DIS_WINDOWS
cpp-options: -DIS_WINDOWS
else
build-depends:
, unix ^>=2.7
if flag(no-exe)
if flag(no-exe)
buildable: False
buildable: False
...
...
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