Browse files

Use LDSHARED from MRI when building extension for MRI

Fixes #1688
  • Loading branch information...
1 parent 56a38b5 commit 6390e9587fccb960f6d35897bf1d9359cc909c19 @dbussink dbussink committed Jun 10, 2012
Showing with 2 additions and 11 deletions.
  1. +2 −11 rakelib/ext_helper.rb
View
13 rakelib/ext_helper.rb
@@ -99,17 +99,6 @@ def add_mri_capi
$LIBS << " #{DEFAULT_CONFIG["LIBS"]}"
$LIBS << " #{DEFAULT_CONFIG["DLDLIBS"]}"
- case RUBY_PLATFORM
- when /mingw/
- # do nothing
- when /darwin/
- # necessary to avoid problems with RVM injecting flags into the MRI build
- # process.
- add_ldflag DEFAULT_CONFIG["LDSHARED"].split[1..-1].join(' ').gsub(/-dynamiclib/, "")
- else
- add_ldflag DEFAULT_CONFIG["LDSHARED"].split[1..-1].join(' ')
- end
-
add_ldflag DEFAULT_CONFIG["LDFLAGS"]
rubyhdrdir = DEFAULT_CONFIG["rubyhdrdir"]
if rubyhdrdir
@@ -120,6 +109,8 @@ def add_mri_capi
else
add_include_dir DEFAULT_CONFIG["archdir"]
end
+
+ $LDSHARED = DEFAULT_CONFIG["LDSHARED"]
end
def include18_dir

0 comments on commit 6390e95

Please sign in to comment.