~mdw / termux-packages / blame
| Commit | Line | Data |
|---|---|---|
| ed021630 | 1 | diff -u -r ../LuaJIT-2.1.0-beta2/src/Makefile ./src/Makefile |
| 9d7fe754 FF |
2 | --- ../LuaJIT-2.1.0-beta2/src/Makefile 2016-03-03 12:40:00.000000000 +0100 |
| 3 | +++ ./src/Makefile 2017-01-15 17:10:13.854284079 +0100 | |
| 4 | @@ -27,7 +27,7 @@ | |
| 5 | DEFAULT_CC = gcc | |
| 6 | # | |
| 7 | # LuaJIT builds as a native 32 or 64 bit binary by default. | |
| 8 | -CC= $(DEFAULT_CC) | |
| 9 | +CC?= $(DEFAULT_CC) | |
| 10 | # | |
| 11 | # Use this if you want to force a 32 bit build on a 64 bit multilib OS. | |
| 12 | #CC= $(DEFAULT_CC) -m32 | |
| ed021630 | 13 | @@ -71,14 +71,14 @@ |
| 59f0d218 FF |
14 | # as dynamic mode. |
| 15 | # | |
| 16 | # Mixed mode creates a static + dynamic library and a statically linked luajit. | |
| 17 | -BUILDMODE= mixed | |
| 18 | +#BUILDMODE= mixed | |
| 19 | # | |
| 20 | # Static mode creates a static library and a statically linked luajit. | |
| 21 | #BUILDMODE= static | |
| 22 | # | |
| 23 | # Dynamic mode creates a dynamic library and a dynamically linked luajit. | |
| 24 | # Note: this executable will only run when the library is installed! | |
| 25 | -#BUILDMODE= dynamic | |
| 26 | +BUILDMODE= dynamic | |
| 27 | # | |
| 28 | ############################################################################## | |
| 29 | ||
| 9d7fe754 FF |
30 | @@ -191,7 +191,7 @@ |
| 31 | CCOPTIONS= $(CCDEBUG) $(ASOPTIONS) | |
| 32 | LDOPTIONS= $(CCDEBUG) $(LDFLAGS) | |
| ed021630 | 33 | |
| 9d7fe754 FF |
34 | -HOST_CC= $(CC) |
| 35 | +HOST_CC?= $(CC) | |
| 36 | HOST_RM= rm -f | |
| 37 | # If left blank, minilua is built and used. You can supply an installed | |
| 38 | # copy of (plain) Lua 5.1 or 5.2, plus Lua BitOp. E.g. with: HOST_LUA=lua | |
| 39 | @@ -204,17 +204,17 @@ | |
| 40 | HOST_ALDFLAGS= $(LDOPTIONS) $(HOST_XLDFLAGS) $(HOST_LDFLAGS) | |
| 41 | HOST_ALIBS= $(HOST_XLIBS) $(LIBS) $(HOST_LIBS) | |
| 42 | ||
| 43 | -STATIC_CC = $(CROSS)$(CC) | |
| 44 | -DYNAMIC_CC = $(CROSS)$(CC) -fPIC | |
| 45 | +STATIC_CC = $(CC) | |
| 46 | +DYNAMIC_CC = $(CC) -fPIC | |
| 47 | TARGET_CC= $(STATIC_CC) | |
| 48 | TARGET_STCC= $(STATIC_CC) | |
| 49 | TARGET_DYNCC= $(DYNAMIC_CC) | |
| 50 | -TARGET_LD= $(CROSS)$(CC) | |
| 51 | -TARGET_AR= $(CROSS)ar rcus | |
| 52 | -TARGET_STRIP= $(CROSS)strip | |
| 53 | +TARGET_LD= $(CC) | |
| 54 | +TARGET_AR= $(AR) rcus | |
| 55 | +TARGET_STRIP= $(STRIP) | |
| 5e8d6367 FF |
56 | |
| 57 | TARGET_LIBPATH= $(or $(PREFIX),/usr/local)/$(or $(MULTILIB),lib) | |
| 58 | -TARGET_SONAME= libluajit-$(ABIVER).so.$(MAJVER) | |
| 59 | +TARGET_SONAME= libluajit-$(ABIVER).so | |
| 60 | TARGET_DYLIBNAME= libluajit-$(ABIVER).$(MAJVER).dylib | |
| 61 | TARGET_DYLIBPATH= $(TARGET_LIBPATH)/$(TARGET_DYLIBNAME) | |
| 62 | TARGET_DLLNAME= lua$(NODOTABIVER).dll |