Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Alex D
GHC
Commits
979c1134
Commit
979c1134
authored
May 03, 2010
by
Ian Lynagh
Browse files
Fix dynamic libs on OS X, and enable them by default
parent
8ecf9d56
Changes
2
Hide whitespace changes
Inline
Side-by-side
libffi/ghc.mk
View file @
979c1134
...
...
@@ -86,7 +86,7 @@ libffi_DYNAMIC_LIBS = $(libffi_HS_DYN_LIB)
else
libffi_DYNAMIC_PROG
=
ifeq
"$(darwin_TARGET_OS)" "1"
libffi_DYNAMIC_LIBS
=
libffi/libffi
$(soext)
libffi/libffi.5
$(soext)
libffi/libffi.5.0.9
$(soext)
libffi_DYNAMIC_LIBS
=
libffi/
dist-install/build/
libffi
$(soext)
libffi/
dist-install/build/
libffi.5
$(soext)
libffi/
dist-install/build/
libffi.5.0.9
$(soext)
else
libffi_DYNAMIC_LIBS
=
libffi/dist-install/build/libffi.so
\
libffi/dist-install/build/libffi.so.5
...
...
@@ -207,8 +207,8 @@ $(libffi_DYNAMIC_LIBS): $(libffi_STAMP_BUILD)
$(libffi_HS_DYN_LIB)
:
$(libffi_DYNAMIC_LIBS) | $$(dir $$@)/.
"
$(CP)
"
$(
word
1,
$(libffi_DYNAMIC_LIBS)
)
$(libffi_HS_DYN_LIB)
ifeq
"$(darwin_TARGET_OS)" "1"
# Ensure library's install name is correct before anyone links with it.
install_name_tool
-id
$(ghclibdir)/$(libffi_HS_DYN_LIB_NAME)
$(libffi_HS_DYN_LIB)
# Ensure library's install name is correct before anyone links with it.
install_name_tool
-id
$(ghclibdir)
/
$(libffi_HS_DYN_LIB_NAME)
$(libffi_HS_DYN_LIB)
endif
$(eval
$(call
all-target,libffi,$(libffi_HS_DYN_LIB)))
...
...
mk/config.mk.in
View file @
979c1134
...
...
@@ -102,7 +102,7 @@ GhcDebugged=NO
GhcLibProfiled
=
$(
if
$(
filter
p,
$(GhcLibWays)
)
,YES,NO
)
# Do we support shared libs?
PlatformSupportsSharedLibs
=
$(
if
$(
filter
$(TARGETPLATFORM)
,i386-unknown-linux x86_64-unknown-linux i386-unknown-freebsd x86_64-unknown-freebsd i386-unknown-mingw32
)
,YES,NO
)
PlatformSupportsSharedLibs
=
$(
if
$(
filter
$(TARGETPLATFORM)
,i386-unknown-linux x86_64-unknown-linux i386-unknown-freebsd x86_64-unknown-freebsd i386-unknown-mingw32
i386-apple-darwin
)
,YES,NO
)
# ToDo later:
# BuildStaticLibs=@BuildStaticLibs@
...
...
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