diff options
| author | ngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-09-12 12:47:49 +0000 |
|---|---|---|
| committer | ngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-09-12 12:47:49 +0000 |
| commit | a6f13053807a121e2169c3002984ae3916ce089f (patch) | |
| tree | 59e85646c92cb4491cec0b39614f1b8dd7aeb388 | |
| parent | 88d28fb7cd08938bc5f0f75d3fdb23d3df2c762f (diff) | |
* Makefile.in (libruby-static.a): change LDFLAGS order. LDFLAGS may include library path that should be specified before LIBS.
[ruby-dev:47707] [Bug #8901]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42919 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.in | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Thu Sep 12 21:35:46 2013 Naohisa Goto <ngotogenome@gmail.com> + + * Makefile.in (libruby-static.a): change LDFLAGS order. LDFLAGS may + include library path that should be specified before LIBS. + [ruby-dev:47707] [Bug #8901] + Thu Sep 12 20:07:29 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> * vsnprintf.c (MAXEXP, MAXFRACT): calculate depending on constants in diff --git a/Makefile.in b/Makefile.in index 0034381630..7e8ed8294b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -215,7 +215,7 @@ $(LIBRUBY_A): $(Q) $(AR) $(ARFLAGS) $@ $(LIBRUBY_A_OBJS) $(DMYEXT) @-$(RANLIB) $@ 2> /dev/null || true $(ECHO) verifying static-library $@ - @$(PURIFY) $(CC) $(XLDFLAGS) $(MAINOBJ) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)conftest$(EXEEXT) $(LDFLAGS) + @$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)conftest$(EXEEXT) @$(RM) conftest$(EXEEXT) conftest.c $(LIBRUBY_SO): |