Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Shayne Fletcher
Glasgow Haskell Compiler
Commits
2f8e9541
Commit
2f8e9541
authored
Jun 11, 2008
by
Ian Lynagh
Browse files
Get rid of the last remnants of PROJECT_DIR
This disappeared when we stopped being "fptools" and became just "ghc"
parent
4f53271d
Changes
2
Hide whitespace changes
Inline
Side-by-side
compiler/Makefile
View file @
2f8e9541
...
...
@@ -257,8 +257,6 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk
@
echo
"cLdIsGNULd =
\"
$(LdIsGNULd)
\"
"
>>
$(CONFIG_HS)
@
echo
"cLD_X :: String"
>>
$(CONFIG_HS)
@
echo
"cLD_X =
\"
$(LD_X)
\"
"
>>
$(CONFIG_HS)
@
echo
"cPROJECT_DIR :: String"
>>
$(CONFIG_HS)
@
echo
"cPROJECT_DIR =
\"
$(PROJECT_DIR)
\"
"
>>
$(CONFIG_HS)
@
echo
"cGHC_DRIVER_DIR_REL :: String"
>>
$(CONFIG_HS)
@
echo
"cGHC_DRIVER_DIR_REL =
\"
$(GHC_DRIVER_DIR_REL)
\"
"
>>
$(CONFIG_HS)
@
echo
"cGHC_TOUCHY_PGM :: String"
>>
$(CONFIG_HS)
...
...
compiler/main/SysTools.lhs
View file @
2f8e9541
...
...
@@ -167,13 +167,7 @@ initSysTools mbMinusB dflags
; let installed, installed_bin :: FilePath -> FilePath
installed_bin pgm = top_dir </> pgm
installed file = top_dir </> file
inplace dir pgm = top_dir </>
#ifndef darwin_TARGET_OS
-- Not sure where cPROJECT_DIR makes sense, on Mac OS, building with
-- xcodebuild, it surely is a *bad* idea! -=chak
cPROJECT_DIR </>
#endif
dir </> pgm
inplace dir pgm = top_dir </> dir </> pgm
; let pkgconfig_path
| am_installed = installed "package.conf"
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment