kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

win32/Makefile.sub: LIBDIR_BASENAME

Browse source 
* mjit.c (init_header_filename): support LIBDIR_BASENAME.

* win32/Makefile.sub (config.h): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63264 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-04-26 12:36:27 +00:00
parent 8036af48a5
commit 81f02142b8
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
mjit.c
View file

@ -1176,13 +1176,20 @@ init_header_filename(void)
const size_t header_name_len = sizeof(header_name) - 1; const size_t header_name_len = sizeof(header_name) - 1;
char *p; char *p;
#ifdef _WIN32 #ifdef _WIN32
static const char libdirname[] = "/"
# ifdef LIBDIR_BASENAME
LIBDIR_BASENAME
# else
"lib"
# endif
;
static const char libpathflag[] = static const char libpathflag[] =
# ifdef _MSC_VER # ifdef _MSC_VER
"-LIBPATH:" "-LIBPATH:"
# else # else
"-L" "-L"
# endif # endif
; ;
const size_t libpathflag_len = sizeof(libpathflag) - 1; const size_t libpathflag_len = sizeof(libpathflag) - 1;
#endif #endif
@ -1210,9 +1217,9 @@ init_header_filename(void)
p = append_str2(p, basedir, baselen); p = append_str2(p, basedir, baselen);
*p = '\0'; *p = '\0';
libruby_installed = xmalloc(libpathflag_len + baselen + rb_strlen_lit("/lib") + 1); libruby_installed = xmalloc(libpathflag_len + baselen + sizeof(libdirname));
p = append_str2(libruby_installed, libruby_build, p - libruby_build); p = append_str2(libruby_installed, libruby_build, p - libruby_build);
p = append_lit(p, "/lib"); p = append_str(p, libdirname);
*p = '\0'; *p = '\0';
#endif #endif
} }

3
win32/Makefile.sub
View file

@ -834,6 +834,9 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub
#define DEFAULT_KCODE KCODE_NONE #define DEFAULT_KCODE KCODE_NONE
#define LOAD_RELATIVE 1 #define LOAD_RELATIVE 1
#define DLEXT ".so" #define DLEXT ".so"
!if "$(libdir_basename)" != "lib"
#define LIBDIR_BASENAME "$(libdir_basename)"
!endif
!if "$(EXTSTATIC)" == "static" !if "$(EXTSTATIC)" == "static"
#define EXTSTATIC 1 #define EXTSTATIC 1
!endif !endif