Skip to content

Commit

Permalink
Don't mask out build env vars for cross-ruby (#182)
Browse files Browse the repository at this point in the history
This was introduced in commit a7c113e to avoid interference with host build.
However it prohibits setting important flags for cross-build.

Also don't force 'LDFLAGS=-pipe -s' in configure, which doesn't work with clang targeting MacOS.
It can now be set externally.
  • Loading branch information
larskanis committed Dec 23, 2020
1 parent c76f433 commit d1e053e
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions tasks/bin/cross-ruby.rake
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ RUBY_SOURCE = ENV['SOURCE']
RUBY_BUILD = RbConfig::CONFIG["host"]

# Unset any possible variable that might affect compilation
["CC", "CXX", "CPPFLAGS", "LDFLAGS", "RUBYOPT"].each do |var|
["RUBYOPT"].each do |var|
ENV.delete(var)
end

Expand Down Expand Up @@ -119,7 +119,6 @@ RUBY_CC_VERSIONS.split(":").each do |ruby_cc_version|
'--enable-shared',
'--disable-install-doc',
'--with-ext=',
'LDFLAGS=-pipe -s',
]

# Force Winsock2 for Ruby 1.8, 1.9 defaults to it
Expand Down

0 comments on commit d1e053e

Please sign in to comment.