gcc/jit: Rename libgccjit.dll to libgccjit-0.dll.

2020-06-09  Nicolas Bértolo  <nicolasbertolo@gmail.com>

	* Make-lang.in: Always define version, minor and release
	numbers. Create the Windows shared library as
	libgccjit-$(LIBGCCJIT_VERSION_NUM).dll.
This commit is contained in:
Nicolas Bertolo 2020-06-09 11:37:51 -03:00 committed by Jonathan Yong
parent 882af4350b
commit f8d6596c79
1 changed files with 10 additions and 8 deletions

View File

@ -40,8 +40,13 @@
# into the jit rule, but that needs a little bit of work
# to do the right thing within all.cross.
LIBGCCJIT_VERSION_NUM = 0
LIBGCCJIT_MINOR_NUM = 0
LIBGCCJIT_RELEASE_NUM = 1
ifneq (,$(findstring mingw,$(target)))
LIBGCCJIT_FILENAME = libgccjit.dll
LIBGCCJIT_FILENAME = libgccjit-$(LIBGCCJIT_VERSION_NUM).dll
LIBGCCJIT_IMPORT_LIB = libgccjit.dll.a
jit: $(LIBGCCJIT_FILENAME) \
$(FULL_DRIVER_NAME)
@ -49,9 +54,6 @@ jit: $(LIBGCCJIT_FILENAME) \
else
LIBGCCJIT_LINKER_NAME = libgccjit.so
LIBGCCJIT_VERSION_NUM = 0
LIBGCCJIT_MINOR_NUM = 0
LIBGCCJIT_RELEASE_NUM = 1
LIBGCCJIT_SONAME = $(LIBGCCJIT_LINKER_NAME).$(LIBGCCJIT_VERSION_NUM)
LIBGCCJIT_FILENAME = \
@ -102,8 +104,8 @@ endif
jit-warn = $(STRICT_WARN)
ifneq (,$(findstring mingw,$(target)))
# Create import library libgccjit.dll.a
LIBGCCJIT_EXTRA_OPTS = -Wl,--out-implib,$(LIBGCCJIT_FILENAME).a
# Create import library
LIBGCCJIT_EXTRA_OPTS = -Wl,--out-implib,$(LIBGCCJIT_IMPORT_LIB)
else
LIBGCCJIT_EXTRA_OPTS = $(LIBGCCJIT_VERSION_SCRIPT_OPTION) \
$(LIBGCCJIT_SONAME_OPTION)
@ -308,8 +310,8 @@ jit.install-headers:
ifneq (,$(findstring mingw,$(target)))
jit.install-common: installdirs jit.install-headers
# Install import library
$(INSTALL_PROGRAM) $(LIBGCCJIT_FILENAME).a \
$(DESTDIR)$(libdir)/$(LIBGCCJIT_FILENAME).a
$(INSTALL_PROGRAM) $(LIBGCCJIT_IMPORT_LIB) \
$(DESTDIR)$(libdir)/$(LIBGCCJIT_IMPORT_LIB)
# Install DLL file
$(INSTALL_PROGRAM) $(LIBGCCJIT_FILENAME) \
$(DESTDIR)$(bindir)/$(LIBGCCJIT_FILENAME)