diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-22 02:33:44 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-22 02:33:44 +0000 |
| commit | b9ef804fb8616ae6b7d1fe2ec0fd9eb7a2026055 (patch) | |
| tree | 06821845b67f888195c08ecfe97fa7472b15443f | |
| parent | d2c218d559d7137f440933f29ca77d1ae65485b8 (diff) | |
| download | ruby-b9ef804fb8616ae6b7d1fe2ec0fd9eb7a2026055.tar.gz | |
mkmf.rb: adjust default library path
* lib/mkmf.rb (MakeMakefile#init_mkmf): adjust default library path
for multiarch. [Bug #7874]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39371 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/mkmf.rb | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Fri Feb 22 11:33:42 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/mkmf.rb (MakeMakefile#init_mkmf): adjust default library path + for multiarch. [Bug #7874] + Fri Feb 22 11:10:00 2013 Zachary Scott <zachary@zacharyscott.net> * enum.c (Enumerable#chunk: Improved examples, grammar, and formatting diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 7ebc198202..efa2982a23 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -2339,7 +2339,7 @@ site-install-rb: install-rb $LIBRUBYARG = "" $LIBRUBYARG_STATIC = config['LIBRUBYARG_STATIC'] $LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED'] - $DEFLIBPATH = [$extmk ? "$(topdir)" : "$(libdir)"] + $DEFLIBPATH = [$extmk ? "$(topdir)" : "$(#{config["libdirname"]})"] $DEFLIBPATH.unshift(".") $LIBPATH = [] $INSTALLFILES = [] |