diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-04-26 12:36:27 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-04-26 12:36:27 +0000 |
| commit | 81f02142b885f2dbe0b19f77b18a7d5736e1085b (patch) | |
| tree | 6f83910e28a5d80fcabb82d5c49d78ffd82e7e8e | |
| parent | 8036af48a524977be1fd17c64d961531b1913b47 (diff) | |
win32/Makefile.sub: LIBDIR_BASENAME
* 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
| -rw-r--r-- | mjit.c | 13 | ||||
| -rw-r--r-- | win32/Makefile.sub | 3 |
2 files changed, 13 insertions, 3 deletions
@@ -1176,13 +1176,20 @@ init_header_filename(void) const size_t header_name_len = sizeof(header_name) - 1; char *p; #ifdef _WIN32 + static const char libdirname[] = "/" +# ifdef LIBDIR_BASENAME + LIBDIR_BASENAME +# else + "lib" +# endif + ; static const char libpathflag[] = # ifdef _MSC_VER "-LIBPATH:" # else "-L" # endif - ; + ; const size_t libpathflag_len = sizeof(libpathflag) - 1; #endif @@ -1210,9 +1217,9 @@ init_header_filename(void) p = append_str2(p, basedir, baselen); *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_lit(p, "/lib"); + p = append_str(p, libdirname); *p = '\0'; #endif } diff --git a/win32/Makefile.sub b/win32/Makefile.sub index e4d3d48a61..bd54f1debe 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -834,6 +834,9 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub #define DEFAULT_KCODE KCODE_NONE #define LOAD_RELATIVE 1 #define DLEXT ".so" +!if "$(libdir_basename)" != "lib" +#define LIBDIR_BASENAME "$(libdir_basename)" +!endif !if "$(EXTSTATIC)" == "static" #define EXTSTATIC 1 !endif |