Trying to install shared objects with the correct extension when cross-compiling

This commit is contained in:
Paolo Bosetti 2016-03-14 12:16:10 +01:00
parent db1b399af1
commit 1ebfe73bda

View File

@ -46,17 +46,22 @@ INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig
INSTALL_TNAME= luajit-$(VERSION) INSTALL_TNAME= luajit-$(VERSION)
INSTALL_TSYMNAME= luajit INSTALL_TSYMNAME= luajit
INSTALL_ANAME= libluajit-$(ABIVER).a INSTALL_ANAME= libluajit-$(ABIVER).a
INSTALL_SONAME= libluajit-$(ABIVER).so.$(MAJVER).$(MINVER).$(RELVER) INSTALL_SOEXT= so
INSTALL_SOSHORT= libluajit-$(ABIVER).so ifndef TARGET_SYS
INSTALL_DYLIBNAME= libluajit-$(ABIVER).$(MAJVER).$(MINVER).$(RELVER).dylib TARGET_SYS= $(shell uname -s)
INSTALL_DYLIBSHORT1= libluajit-$(ABIVER).dylib endif
INSTALL_DYLIBSHORT2= libluajit-$(ABIVER).$(MAJVER).dylib ifeq (Darwin,$(TARGET_SYS))
INSTALL_SOEXT= dylib
endif
INSTALL_SOSHORT1= libluajit-$(ABIVER).$(INSTALL_SOEXT)
INSTALL_SOSHORT2= libluajit-$(ABIVER).$(MAJVER).$(INSTALL_SOEXT)
INSTALL_SONAME= $(INSTALL_SOSHORT1).$(MAJVER).$(MINVER).$(RELVER)
INSTALL_PCNAME= luajit.pc INSTALL_PCNAME= luajit.pc
INSTALL_STATIC= $(INSTALL_LIB)/$(INSTALL_ANAME) INSTALL_STATIC= $(INSTALL_LIB)/$(INSTALL_ANAME)
INSTALL_DYN= $(INSTALL_LIB)/$(INSTALL_SONAME) INSTALL_DYN= $(INSTALL_LIB)/$(INSTALL_SONAME)
INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_SOSHORT) INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_SOSHORT1)
INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT) INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT2)
INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME) INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME)
INSTALL_TSYM= $(INSTALL_BIN)/$(INSTALL_TSYMNAME) INSTALL_TSYM= $(INSTALL_BIN)/$(INSTALL_TSYMNAME)
INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME) INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME)
@ -88,24 +93,22 @@ FILES_JITLIB= bc.lua v.lua dump.lua dis_x86.lua dis_x64.lua dis_arm.lua \
ifeq (,$(findstring Windows,$(OS))) ifeq (,$(findstring Windows,$(OS)))
ifeq (Darwin,$(shell uname -s)) ifeq (Darwin,$(shell uname -s))
INSTALL_SONAME= $(INSTALL_DYLIBNAME)
INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_DYLIBSHORT1)
INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_DYLIBSHORT2)
LDCONFIG= : LDCONFIG= :
endif endif
endif endif
############################################################################## ##############################################################################
INSTALL_DEP= src/luajit INSTALL_DEP= src/luajit
default all $(INSTALL_DEP): default all $(INSTALL_DEP):
@echo "==== Building LuaJIT $(VERSION) ====" @echo "==== Building LuaJIT $(VERSION) for target $(TARGET_SYS) ===="
$(MAKE) -C src $(MAKE) -C src
@echo "==== Successfully built LuaJIT $(VERSION) ====" @echo "==== Successfully built LuaJIT $(VERSION) ===="
install: $(INSTALL_DEP) install: $(INSTALL_DEP)
@echo "==== Installing LuaJIT $(VERSION) to $(PREFIX) ====" @echo "==== Installing LuaJIT $(VERSION) to $(PREFIX) for target $(TARGET_SYS) ===="
$(MKDIR) $(INSTALL_DIRS) $(MKDIR) $(INSTALL_DIRS)
cd src && $(INSTALL_X) $(FILE_T) $(INSTALL_T) cd src && $(INSTALL_X) $(FILE_T) $(INSTALL_T)
cd src && test -f $(FILE_A) && $(INSTALL_F) $(FILE_A) $(INSTALL_STATIC) || : cd src && test -f $(FILE_A) && $(INSTALL_F) $(FILE_A) $(INSTALL_STATIC) || :