mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* Makefile.in (miniruby): add XLDFLAGS.
* configure.in (aix): use -bE option for miniruby. [ruby-dev:29698] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11246 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
66d43b5fd6
commit
491a7ee7a6
3 changed files with 19 additions and 14 deletions
|
@ -1,4 +1,8 @@
|
|||
Mon Oct 30 23:22:43 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
Mon Oct 30 23:40:52 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* Makefile.in (miniruby): add XLDFLAGS.
|
||||
|
||||
* configure.in (aix): use -bE option for miniruby. [ruby-dev:29698]
|
||||
|
||||
* dir.c (glob_helper): get rid of possible memory leak.
|
||||
|
||||
|
|
|
@ -98,7 +98,7 @@ all:
|
|||
|
||||
miniruby$(EXEEXT):
|
||||
@$(RM) $@
|
||||
$(PURIFY) $(CC) $(MAINOBJ) $(MINIOBJS) $(LIBRUBY_A) $(LIBS) $(OUTFLAG)$@ $(LDFLAGS) $(MAINLIBS)
|
||||
$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(MINIOBJS) $(LIBRUBY_A) $(LIBS) $(OUTFLAG)$@
|
||||
|
||||
$(PROGRAM):
|
||||
@$(RM) $@
|
||||
|
|
25
configure.in
25
configure.in
|
@ -994,13 +994,15 @@ if test "$with_dln_a_out" != yes; then
|
|||
: ${LIBPATHENV=DYLD_LIBRARY_PATH}
|
||||
rb_cv_dlopen=yes ;;
|
||||
aix*) if test "$GCC" = yes; then
|
||||
: ${LDSHARED='gcc -shared'}
|
||||
DLDFLAGS='-Wl,-G -eInit_$(TARGET)'
|
||||
LDFLAGS='-Wl,-brtl -Wl,-bE:ruby.imp'
|
||||
else
|
||||
: ${LDSHARED='/usr/ccs/bin/ld'}
|
||||
DLDFLAGS='-G -eInit_$(TARGET)'
|
||||
LDFLAGS="-brtl -bE:ruby.imp"
|
||||
: ${LDSHARED='$(CC) -shared'}
|
||||
DLDFLAGS='-Wl,-G -eInit_$(TARGET)'
|
||||
LDFLAGS='-Wl,-brtl'
|
||||
XLDFLAGS='-Wl,-bE:ruby.imp'
|
||||
else
|
||||
: ${LDSHARED='/usr/ccs/bin/ld'}
|
||||
DLDFLAGS='-G -eInit_$(TARGET)'
|
||||
LDFLAGS='-brtl'
|
||||
XLDFLAGS='-bE:ruby.imp'
|
||||
fi
|
||||
: ${ARCHFILE="ruby.imp"}
|
||||
TRY_LINK='$(CC) $(LDFLAGS) -oconftest $(INCFLAGS) -I$(hdrdir) $(CPPFLAGS)'
|
||||
|
@ -1322,13 +1324,12 @@ if test "$enable_shared" = 'yes'; then
|
|||
;;
|
||||
aix*)
|
||||
if test "$GCC" = yes; then
|
||||
LIBRUBY_LDSHARED='$(CC) -shared'
|
||||
LIBRUBY_DLDFLAGS='-Wl,-G -Wl,-bE:ruby.imp -Wl,-bnoentry'
|
||||
LIBRUBY_DLDFLAGS='-Wl,-G -Wl,-bnoentry'
|
||||
else
|
||||
LIBRUBY_LDSHARED='/usr/ccs/bin/ld'
|
||||
LIBRUBY_DLDFLAGS='-G -bE:ruby.imp -bnoentry'
|
||||
LIBRUBY_DLDFLAGS='-G -bnoentry'
|
||||
fi
|
||||
LIBRUBYARG_SHARED='-L${libdir} -lruby'
|
||||
LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS $XLDFLAGS"
|
||||
LIBRUBYARG_SHARED='-L${libdir} -l${RUBY_SO_NAME}'
|
||||
SOLIBS='-lm -lc'
|
||||
;;
|
||||
beos*)
|
||||
|
|
Loading…
Reference in a new issue