* lib/mkmf.rb: should quote arch_hdrdir and libpath for the case
installed prefix contains spaces. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31991 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
fe244c77b0
commit
ac0ab1f675
@ -1,3 +1,8 @@
|
|||||||
|
Sat Jun 11 10:32:46 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
|
* lib/mkmf.rb: should quote arch_hdrdir and libpath for the case
|
||||||
|
installed prefix contains spaces.
|
||||||
|
|
||||||
Sat Jun 11 10:20:52 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
Sat Jun 11 10:20:52 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
* thread_pthread.c (native_cond_timeout): wrap conditinally used label.
|
* thread_pthread.c (native_cond_timeout): wrap conditinally used label.
|
||||||
|
10
lib/mkmf.rb
10
lib/mkmf.rb
@ -392,22 +392,22 @@ end
|
|||||||
def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH)
|
def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH)
|
||||||
conf = RbConfig::CONFIG.merge('hdrdir' => $hdrdir.quote,
|
conf = RbConfig::CONFIG.merge('hdrdir' => $hdrdir.quote,
|
||||||
'src' => "#{CONFTEST_C}",
|
'src' => "#{CONFTEST_C}",
|
||||||
'arch_hdrdir' => "#$arch_hdrdir",
|
'arch_hdrdir' => $arch_hdrdir.quote,
|
||||||
'top_srcdir' => $top_srcdir.quote,
|
'top_srcdir' => $top_srcdir.quote,
|
||||||
'INCFLAGS' => "#$INCFLAGS",
|
'INCFLAGS' => "#$INCFLAGS",
|
||||||
'CPPFLAGS' => "#$CPPFLAGS",
|
'CPPFLAGS' => "#$CPPFLAGS",
|
||||||
'CFLAGS' => "#$CFLAGS",
|
'CFLAGS' => "#$CFLAGS",
|
||||||
'ARCH_FLAG' => "#$ARCH_FLAG",
|
'ARCH_FLAG' => "#$ARCH_FLAG",
|
||||||
'LDFLAGS' => "#$LDFLAGS #{ldflags}",
|
'LDFLAGS' => "#$LDFLAGS #{ldflags}",
|
||||||
'LIBPATH' => libpathflag(libpath),
|
|
||||||
'LOCAL_LIBS' => "#$LOCAL_LIBS #$libs",
|
'LOCAL_LIBS' => "#$LOCAL_LIBS #$libs",
|
||||||
'LIBS' => "#$LIBRUBYARG_STATIC #{opt} #$LIBS")
|
'LIBS' => "#$LIBRUBYARG_STATIC #{opt} #$LIBS")
|
||||||
|
conf['LIBPATH'] = libpathflag(libpath.map {|s| RbConfig::expand(s.dup, conf)})
|
||||||
RbConfig::expand(TRY_LINK.dup, conf)
|
RbConfig::expand(TRY_LINK.dup, conf)
|
||||||
end
|
end
|
||||||
|
|
||||||
def cc_command(opt="")
|
def cc_command(opt="")
|
||||||
conf = RbConfig::CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote,
|
conf = RbConfig::CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote,
|
||||||
'arch_hdrdir' => "#$arch_hdrdir",
|
'arch_hdrdir' => $arch_hdrdir.quote,
|
||||||
'top_srcdir' => $top_srcdir.quote)
|
'top_srcdir' => $top_srcdir.quote)
|
||||||
RbConfig::expand("$(CC) #$INCFLAGS #$CPPFLAGS #$CFLAGS #$ARCH_FLAG #{opt} -c #{CONFTEST_C}",
|
RbConfig::expand("$(CC) #$INCFLAGS #$CPPFLAGS #$CFLAGS #$ARCH_FLAG #{opt} -c #{CONFTEST_C}",
|
||||||
conf)
|
conf)
|
||||||
@ -415,7 +415,7 @@ end
|
|||||||
|
|
||||||
def cpp_command(outfile, opt="")
|
def cpp_command(outfile, opt="")
|
||||||
conf = RbConfig::CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote,
|
conf = RbConfig::CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote,
|
||||||
'arch_hdrdir' => "#$arch_hdrdir",
|
'arch_hdrdir' => $arch_hdrdir.quote,
|
||||||
'top_srcdir' => $top_srcdir.quote)
|
'top_srcdir' => $top_srcdir.quote)
|
||||||
RbConfig::expand("$(CPP) #$INCFLAGS #$CPPFLAGS #$CFLAGS #{opt} #{CONFTEST_C} #{outfile}",
|
RbConfig::expand("$(CPP) #$INCFLAGS #$CPPFLAGS #$CFLAGS #{opt} #{CONFTEST_C} #{outfile}",
|
||||||
conf)
|
conf)
|
||||||
@ -1648,7 +1648,7 @@ ECHO = $(ECHO1:0=@echo)
|
|||||||
srcdir = #{srcdir.gsub(/\$\((srcdir)\)|\$\{(srcdir)\}/) {mkintpath(CONFIG[$1||$2])}.quote}
|
srcdir = #{srcdir.gsub(/\$\((srcdir)\)|\$\{(srcdir)\}/) {mkintpath(CONFIG[$1||$2])}.quote}
|
||||||
topdir = #{mkintpath($extmk ? CONFIG["topdir"] : $topdir).quote}
|
topdir = #{mkintpath($extmk ? CONFIG["topdir"] : $topdir).quote}
|
||||||
hdrdir = #{mkintpath(CONFIG["hdrdir"]).quote}
|
hdrdir = #{mkintpath(CONFIG["hdrdir"]).quote}
|
||||||
arch_hdrdir = #{$arch_hdrdir}
|
arch_hdrdir = #{$arch_hdrdir.quote}
|
||||||
VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
|
VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
|
||||||
}
|
}
|
||||||
if $extmk
|
if $extmk
|
||||||
|
Loading…
x
Reference in New Issue
Block a user