summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--enc/Makefile.in8
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 2356181fd..952630fa7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Dec 30 01:43:56 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * enc/Makefile.in (DLDFLAGS): like as extensions. [ruby-core:14567]
+
Sat Dec 29 23:48:13 2007 Tanaka Akira <akr@fsij.org>
* io.c (io_fflush): don't retry when wbuf modified by other threads.
diff --git a/enc/Makefile.in b/enc/Makefile.in
index 948cd26c2..b9917a12a 100644
--- a/enc/Makefile.in
+++ b/enc/Makefile.in
@@ -30,11 +30,13 @@ CCDLFLAGS = @CCDLFLAGS@
INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(top_srcdir)
DEFS = @DEFS@
CPPFLAGS = @CPPFLAGS@ -DONIG_ENC_REGISTER=rb_enc_register
-LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@
-XLDFLAGS = @XLDFLAGS@ $(EXTLDFLAGS)
+LDFLAGS = @LDFLAGS@
LIBS = @LIBRUBYARG@ @LIBS@ $(EXTLIBS)
LDSHARED = @LDSHARED@
-DLDFLAGS = @DLDFLAGS@ $(EXTLDFLAGS) @ARCH_FLAG@
+ldflags = $(CFLAGS) $(LDFLAGS)
+dldflags = @DLDFLAGS@
+archflag = @ARCH_FLAG@
+DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
RM = @RM@