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
Tobias Decking
GHC
Commits
a7c70e96
Commit
a7c70e96
authored
Oct 14, 2012
by
ian@well-typed.com
Browse files
Move the RPATH computation into the build rules
It doesn't really belong in package-data.mk
parent
817e1d58
Changes
2
Hide whitespace changes
Inline
Side-by-side
rules/build-prog.mk
View file @
a7c70e96
...
...
@@ -175,7 +175,7 @@ ifneq "$3" "0"
ifeq
"$$(DYNAMIC_BY_DEFAULT)" "YES"
$1_$2_GHC_LD_OPTS
=
\
-fno-use-rpaths
\
$
$(
addprefix
-optl-Wl
$
$(comma)
-rpath
-optl-Wl
$
$(comma)
,
$$
(
$1_$2_RPATHS
)
)
$
$(
foreach
d,
$$
(
$1_$2_TRANSITIVE_DEPS
)
,
-optl-Wl
$
$(comma)
-rpath
-optl-Wl
$
$(comma)
'
$$
$$ORIGIN/../$$d'
)
endif
endif
...
...
utils/ghc-cabal/Main.hs
View file @
a7c70e96
...
...
@@ -372,9 +372,6 @@ generate config_args distdir directory
transitive_dep_ids
=
map
Installed
.
sourcePackageId
dep_pkgs
wrappedIncludeDirs
<-
wrap
$
forDeps
Installed
.
includeDirs
wrappedLibraryDirs
<-
wrap
libraryDirs
let
depDynlibDirName
d
=
display
(
Installed
.
sourcePackageId
d
)
rpaths
=
map
(
\
d
->
"'$$ORIGIN/../"
++
depDynlibDirName
d
++
"'"
)
dep_pkgs
let
variablePrefix
=
directory
++
'_'
:
distdir
let
xs
=
[
variablePrefix
++
"_VERSION = "
++
display
(
pkgVersion
(
package
pd
)),
...
...
@@ -386,7 +383,6 @@ generate config_args distdir directory
variablePrefix
++
"_DEP_NAMES = "
++
unwords
(
map
(
display
.
packageName
)
dep_ids
),
variablePrefix
++
"_TRANSITIVE_DEPS = "
++
unwords
(
map
display
transitive_dep_ids
),
variablePrefix
++
"_TRANSITIVE_DEP_NAMES = "
++
unwords
(
map
(
display
.
packageName
)
transitive_dep_ids
),
variablePrefix
++
"_RPATHS = "
++
unwords
rpaths
,
variablePrefix
++
"_INCLUDE_DIRS = "
++
unwords
(
includeDirs
bi
),
variablePrefix
++
"_INCLUDES = "
++
unwords
(
includes
bi
),
variablePrefix
++
"_INSTALL_INCLUDES = "
++
unwords
(
installIncludes
bi
),
...
...
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