diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-28 06:32:24 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-28 06:32:24 +0000 |
| commit | 8f675f0b8976122bdc144b773fa6ee007ba5449f (patch) | |
| tree | 8a7f31a2b5ef7b5f3cbb8476283534d7e5eeeec5 /ext/openssl | |
| parent | 106ce21e917f87ab47aee2db467ddfe0b58d3c7f (diff) | |
openssl: work around of dependency
* ext/openssl/depend (ossl.o): work around of dependency of
thread_native.h, which depends on headers by THREAD_MODEL.
[ruby-dev:47777]
* ext/openssl/extconf.rb: need THREAD_MODEL.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43451 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/openssl')
| -rw-r--r-- | ext/openssl/depend | 2 | ||||
| -rw-r--r-- | ext/openssl/extconf.rb | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ext/openssl/depend b/ext/openssl/depend index 35574e479f..7991159f2e 100644 --- a/ext/openssl/depend +++ b/ext/openssl/depend @@ -3,4 +3,4 @@ $(OBJS): $(HDRS) $(ruby_headers) \ $(hdrdir)/ruby/encoding.h \ $(hdrdir)/ruby/oniguruma.h \ $(hdrdir)/ruby/thread.h -ossl.o: $(top_srcdir)/thread_native.h $(top_srcdir)/thread_pthread.h +ossl.o: $(top_srcdir)/thread_native.h $(top_srcdir)/thread_$(THREAD_MODEL).h diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb index 986ee16cfe..e272cba092 100644 --- a/ext/openssl/extconf.rb +++ b/ext/openssl/extconf.rb @@ -154,5 +154,7 @@ have_macro("EVP_CTRL_GCM_GET_TAG", ['openssl/evp.h']) && $defs.push("-DHAVE_AUTH Logging::message "=== Checking done. ===\n" create_header -create_makefile("openssl") +create_makefile("openssl") {|conf| + conf << "THREAD_MODEL = #{CONFIG["THREAD_MODEL"]}\n" +} Logging::message "Done.\n" |