Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Glasgow Haskell Compiler
GHC
Commits
4a88ae96
Commit
4a88ae96
authored
Jun 21, 2007
by
Simon Marlow
Browse files
Fix problems with new inplace stuff on Cygwin
parent
07ea5541
Changes
2
Hide whitespace changes
Inline
Side-by-side
compiler/Makefile
View file @
4a88ae96
...
...
@@ -706,10 +706,15 @@ all :: $(odir)/ghc-inplace ghc-inplace
INPLACE_HS
=
$(odir)
/ghc-inplace.hs
INPLACE_PROG
=
$(odir)
/ghc-inplace
$(exeext)
EXCLUDED_SRCS
+=
$(INPLACE_HS)
# FPTOOLS_TOP_ABS platform uses backslashes, at least on Cygwin, but that
# will go wrong when we use it in a Haskell string below.
TOP_ABS
=
$(
subst
\\
,/,
$(FPTOOLS_TOP_ABS_PLATFORM)
)
$(INPLACE_HS)
:
Makefile $(FPTOOLS_TOP)/mk/config.mk
echo
"import System.Cmd; import System.Environment"
>
$@
echo
"main = getArgs >>=
\a
rgs -> rawSystem
\"
$(
FPTOOLS_TOP_ABS_PLATFORM
)
/
$(GHC_COMPILER_DIR_REL)
/
$(GHC_PROG)
\"
(
\"
-B
$(
FPTOOLS_TOP_ABS_PLATFORM
)
\"
:args)"
>>
$@
echo
"main = getArgs >>=
\a
rgs -> rawSystem
\"
$(
TOP_ABS
)
/
$(GHC_COMPILER_DIR_REL)
/
$(GHC_PROG)
\"
(
\"
-B
$(
TOP_ABS
)
\"
:args)"
>>
$@
$(INPLACE_PROG)
:
$(INPLACE_HS)
$(GHC)
--make
$<
-o
$@
...
...
utils/ghc-pkg/Makefile
View file @
4a88ae96
...
...
@@ -59,10 +59,15 @@ DIST_CLEAN_FILES += $(VERSION_HS)
INPLACE_HS
=
ghc-pkg-inplace.hs
INPLACE_PROG
=
ghc-pkg-inplace
EXCLUDED_SRCS
+=
$(INPLACE_HS)
# FPTOOLS_TOP_ABS platform uses backslashes, at least on Cygwin, but that
# will go wrong when we use it in a Haskell string below.
TOP_ABS
=
$(
subst
\\
,/,
$(FPTOOLS_TOP_ABS_PLATFORM)
)
$(INPLACE_HS)
:
Makefile $(FPTOOLS_TOP)/mk/config.mk
echo
"import System.Cmd; import System.Environment"
>
$@
echo
"main = getArgs >>=
\a
rgs -> rawSystem
\"
$(
FPTOOLS_TOP_ABS_PLATFORM
)
/
$(GHC_PKG_DIR_REL)
/
$(HS_PROG)
\"
(
\"
--global-conf
\"
:
\"
$(
FPTOOLS_TOP_ABS_PLATFORM
)
/driver/package.conf.inplace
\"
:args)"
>>
$@
echo
"main = getArgs >>=
\a
rgs -> rawSystem
\"
$(
TOP_ABS
)
/
$(GHC_PKG_DIR_REL)
/
$(HS_PROG)
\"
(
\"
--global-conf
\"
:
\"
$(
TOP_ABS
)
/driver/package.conf.inplace
\"
:args)"
>>
$@
$(INPLACE_PROG)
:
$(INPLACE_HS)
$(GHC)
--make
$<
-o
$@
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment