diff options
| author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-05-02 18:35:50 +0000 |
|---|---|---|
| committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-05-02 18:35:50 +0000 |
| commit | f0448281f577fa930c68fb900d30c20c78f75914 (patch) | |
| tree | 021465f712992678f8902147e2b31dfd3c7332c2 | |
| parent | eb0d3500d3879e320a37dafbc888f971201cb8d3 (diff) | |
I'm committing this from a MacOS X host. :)
* configure.in: get --enable-shared to work on MacOS X.
* Makefile.in: make $(LIBRUBY_SO) depend on miniruby properly.
Now `make -jN' should work without a problem.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1360 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | configure.in | 8 |
3 files changed, 15 insertions, 2 deletions
@@ -1,3 +1,10 @@ +Thu May 3 03:15:06 2001 SHIROYAMA Takayuki <psi@fortune.nest.or.jp> + + * configure.in: get --enable-shared to work on MacOS X. + + * Makefile.in: make $(LIBRUBY_SO) depend on miniruby properly. + Now `make -jN' should work without a problem. + Thu May 3 02:07:45 2001 Usaku Nakamura <usa@osb.att.ne.jp> * win32/config.h.in: add SIZEOF___INT64 definition. diff --git a/Makefile.in b/Makefile.in index 4bf2c3eba2..3e906182cb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -98,7 +98,7 @@ $(LIBRUBY_A): $(OBJS) dmyext.@OBJEXT@ @AR@ rcu $@ $(OBJS) dmyext.@OBJEXT@ @-@RANLIB@ $@ 2> /dev/null || true -$(LIBRUBY_SO): $(OBJS) dmyext.@OBJEXT@ +$(LIBRUBY_SO): $(OBJS) dmyext.@OBJEXT@ miniruby$(EXEEXT) $(LDSHARED) $(DLDFLAGS) $(OBJS) dmyext.@OBJEXT@ $(SOLIBS) -o $@ @-@MINIRUBY@ -e 'ARGV.each{|link| File.delete link if File.exist? link; \ File.symlink "$(LIBRUBY_SO)", link}' \ diff --git a/configure.in b/configure.in index 379e880ec4..b275a2bcb1 100644 --- a/configure.in +++ b/configure.in @@ -554,7 +554,7 @@ if test "$with_dln_a_out" != yes; then nextstep*) ;; openstep*) ;; rhapsody*) ;; - darwin*) ;; + darwin*) CCDLFLAGS=-fno-common;; human*) ;; bsdi*) ;; beos*) ;; @@ -916,6 +916,12 @@ if test "$enable_shared" = 'yes'; then ;; esac ;; + darwin*) + LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).$(MAJOR).$(MINOR).$(TEENY).dylib' + LIBRUBY_LDSHARED='cc -dynamiclib -undefined suppress' + LIBRUBY_DLDFLAGS='-install_name lib$(RUBY_INSTALL_NAME).dylib -current_version $(MAJOR).$(MINOR).$(TEENY) -compatibility_version $(MAJOR).$(MINOR)' + LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_INSTALL_NAME).dylib' + ;; *) ;; esac |