diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-10-21 14:03:46 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-10-21 14:03:46 +0000 |
commit | e7ce523bb172c36b61cd5fc8d141a4488323bd84 (patch) | |
tree | 9def4bcac6871845573108cd38c51ead73dfc2c0 /ext/dl | |
parent | 76e8a9e82870393e5cef137526e811a878404096 (diff) |
* configure.in (XCFLAGS): CFLAGS to comile ruby itself.
* configure.in (LIBEXT): suffix for static libraries.
* configure.in (LIBPATHFLAG): switch template to specify library
path.
* configure.in (LINK_SO): command to link shared objects.
* configure.in (DEFFILE, ARCHFILE): miscellaneous system dependent
files.
* configure.in (EXPORT_PREFIX): prefix to exported symbols on
Windows.
* configure.in (COMMON_LIBS, COMMON_MACROS, COMMON_HEADERS):
libraries, macros and headers used in common.
* configure.in (RUBYW_INSTALL_NAME, rubyw_install_name): GUI mode
excutable name.
* Makefile.in (CFLAGS): append XCFLAGS.
* Makefile.in (PREP): miscellaneous system dependent files.
* Makefile.in (ruby.imp, ext/extinit.o): moved from ext/extmk.rb.
* Makefile.in (fake.rb): CROSS_COMPILING keeps building platform.
* Makefile.in (MAKEFILES): depend on *.in and config.status.
* Makefile.in (parse.c): replace "y.tab.c" with actual name for
byacc.
* ext/extmk.rb, lib/mkmf.rb: integrated.
* ext/extmk.rb: propagate MFLAGS.
* ext/extmk.rb (extmake): make dummy Makefile to clean even if no
Makefile is made.
* lib/mkmf.rb (older): accept multiple file names and Time
objects.
* lib/mkmf.rb (xsystem): split and qoute.
* lib/mkmf.rb (cpp_include): make include directives.
* lib/mkmf.rb (try_func): try wheather specified function is
available.
* lib/mkmf.rb (install_files): default to site-install.
* lib/mkmf.rb (checking_for): added.
* lib/mkmf.rb (find_executable0): just find executable file with
no message.
* lib/mkmf.rb (create_header): output header file is variable.
* lib/mkmf.rb (create_makefile): separate sections.
* lib/mkmf.rb (init_mkmf): initialize global variables.
* win32/Makefile.sub, bcc32/Makefile.sub (CPP, AR): added.
* bcc32/Makefile.sub (ARCH): fixed to i386.
* win32/Makefile.sub, bcc32/Makefile.sub (miniruby): should not
link EXTOBJS.
* ext/dl/extconf.rb: use try_cpp to cross compile.
* ext/dl/extconf.rb: not modify files in source directory.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2974 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/dl')
-rw-r--r-- | ext/dl/extconf.rb | 39 |
1 files changed, 15 insertions, 24 deletions
diff --git a/ext/dl/extconf.rb b/ext/dl/extconf.rb index 46b3c6c87d..dd9c3844e4 100644 --- a/ext/dl/extconf.rb +++ b/ext/dl/extconf.rb @@ -33,19 +33,25 @@ else end $with_dlstack = ! $with_asm -$with_type_int = try_run(<<EOF) -int main(){ return sizeof(int) == sizeof(long); } +$with_type_int = try_cpp(<<EOF) +#include "config.h" +#if SIZEOF_INT == SIZEOF_LONG +#error int not needed +#endif EOF -$with_type_float = try_run(<<EOF) -int main(){ return sizeof(float) == sizeof(double); } +$with_type_float = try_cpp(<<EOF) +#include "config.h" +#if SIZEOF_FLOAT == SIZEOF_DOUBLE +#error float not needed +#endif EOF -$with_type_voidp = try_run(<<EOF) -int main(){ - return (sizeof(void *) == sizeof(long)) - || (sizeof(void *) == sizeof(int)); -} +$with_type_voidp = try_cpp(<<EOF) +#include "config.h" +#if SIZEOF_VOIDP == SIZEOF_INT || SIZEOF_VOIDP == SIZEOF_LONG +#error void* not needed +#endif EOF $with_type_char = DLTYPE[CHAR][:sym] @@ -176,21 +182,6 @@ $INSTALLFILES = [ ["dl.h", "$(archdir)$(target_prefix)", ""], ] -if /bccwin32/ =~ RUBY_PLATFORM - srcdir = $top_srcdir + "/ext/dl/" - if !FileTest.exist?( srcdir+"dl.def.org" ) - File.copy( srcdir+"dl.def", srcdir+"dl.def.org" ) - open( srcdir+"dl.def.org" ){ |f| - open( "dl.def", "w" ) { |g| - g.print f.gets - while line = f.gets - g.print "_", line - end - } - } - end -end - create_makefile('dl') rescue SystemExit # do nothing |