diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-04 00:49:52 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-04 00:49:52 +0000 |
| commit | f04daf3bb8696be31ba95fa58630045933ca2057 (patch) | |
| tree | 107f589503d368433441b584052e1f4ce9465712 /configure.in | |
| parent | 28a15075c8a9a48569dc45ff5b7ad1886533d153 (diff) | |
merge revision(s) 36338: [Backport #6709]
* configure.in (DLDFLAGS): use TARGET_ENTRY to specify an entry point
instead of TARGET which may contain non-identifer characters.
* lib/mkmf.rb (create_makefile): add TARGET_NAME which is the first
part consists of only word characters. [ruby-core:46248][Bug #6709]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@40093 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.in b/configure.in index 1f79b580d1..849bb7b7d0 100644 --- a/configure.in +++ b/configure.in @@ -2065,7 +2065,7 @@ if test "$with_dln_a_out" != yes; then rb_cv_dlopen=yes], [aix*], [ : ${LDSHARED='$(CC)'} LDSHARED="$LDSHARED ${linker_flag}-G" - EXTDLDFLAGS='-eInit_$(TARGET)' + EXTDLDFLAGS='-e$(TARGET_ENTRY)' XLDFLAGS="${linker_flag}"'-bE:$(ARCHFILE)'" ${linker_flag}-brtl" XLDFLAGS="$XLDFLAGS ${linker_flag}-blibpath:${prefix}/lib:${LIBPATH:-/usr/lib:/lib}" : ${ARCHFILE="ruby.imp"} @@ -2082,7 +2082,7 @@ if test "$with_dln_a_out" != yes; then [beos*], [ AS_CASE(["$target_cpu"], [powerpc*], [ : ${LDSHARED="ld -xms"} - EXTDLDFLAGS='-export Init_$(TARGET)' + EXTDLDFLAGS='-export $(TARGET_ENTRY)' DLDFLAGS="$DLDFLAGS -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o" LDFLAGS="$LDFLAGS -L/boot/home/config/lib -lbe -lroot" ], @@ -2096,7 +2096,7 @@ if test "$with_dln_a_out" != yes; then [haiku*], [ AS_CASE(["$target_cpu"], [powerpc*], [ : ${LDSHARED="ld -xms"} - EXTDLDFLAGS='-export Init_$(TARGET)' + EXTDLDFLAGS='-export $(TARGET_ENTRY)' DLDFLAGS="$DLDFLAGS -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o" ], [i586*], [ |