diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-12-21 05:45:01 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-12-21 05:45:01 +0000 |
| commit | 53a7c96417c360f7dfe5b7ed1b81d68867168ef9 (patch) | |
| tree | f593d43040bda8a930c1449c41b8a3626ac0102f /ext/fiddle/depend | |
| parent | cfe3357581b98e18aa4b4574ba262956df76bae8 (diff) | |
| download | ruby-53a7c96417c360f7dfe5b7ed1b81d68867168ef9.tar.gz | |
fiddle: fix build failures
* ext/fiddle/depend (build-libffi): get rid of eventually empty
target for nmake.
* ext/fiddle/extconf.rb: omit stuffs for libffi unless bundled
libffi is found and used.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48913 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/fiddle/depend')
| -rw-r--r-- | ext/fiddle/depend | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ext/fiddle/depend b/ext/fiddle/depend index fe245193e2..4459ddd770 100644 --- a/ext/fiddle/depend +++ b/ext/fiddle/depend @@ -1,5 +1,4 @@ PWD = -LOCAL_LIBS = $(LIBFFI_A) CONFIGURE_LIBFFI = \ cd $(LIBFFI_DIR) && \ @@ -21,8 +20,8 @@ configure-libffi $(FFI_H): $(Q) $(MAKEDIRS) $(LIBFFI_DIR) $(Q) $(CONFIGURE_LIBFFI) -lib: $(LIBFFI_A) -$(LIBFFI_A): +build-libffi: $(LIBFFI_A) +build-libffi $(LIBFFI_A): $(Q) $(SUBMAKE_LIBFFI) configure: configure-libffi |