diff options
| author | Mike Pall <mike> | 2019-01-10 12:37:40 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2019-01-10 12:37:40 +0100 |
| commit | c4f36ce5656e50e4d636dde498e28eb97edfa5fc (patch) | |
| tree | 5c4f56e404d83251151f4a2a4cc4d6acee6630ee | |
| parent | 617f53254250d28b25a58f243e51d0f3b4e9d97f (diff) | |
| parent | 61464b0a5b685489bee7b6680c0e9663f2143a84 (diff) | |
| download | luajit-c4f36ce5656e50e4d636dde498e28eb97edfa5fc.tar.gz luajit-c4f36ce5656e50e4d636dde498e28eb97edfa5fc.tar.bz2 luajit-c4f36ce5656e50e4d636dde498e28eb97edfa5fc.zip | |
Merge branch 'master' into v2.1
| -rw-r--r-- | src/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile index a5490b4b..d22eb732 100644 --- a/src/Makefile +++ b/src/Makefile | |||
| @@ -195,7 +195,7 @@ CCOPTIONS= $(CCDEBUG) $(ASOPTIONS) | |||
| 195 | LDOPTIONS= $(CCDEBUG) $(LDFLAGS) | 195 | LDOPTIONS= $(CCDEBUG) $(LDFLAGS) |
| 196 | 196 | ||
| 197 | HOST_CC= $(CC) | 197 | HOST_CC= $(CC) |
| 198 | HOST_RM= rm -f | 198 | HOST_RM?= rm -f |
| 199 | # If left blank, minilua is built and used. You can supply an installed | 199 | # If left blank, minilua is built and used. You can supply an installed |
| 200 | # copy of (plain) Lua 5.1 or 5.2, plus Lua BitOp. E.g. with: HOST_LUA=lua | 200 | # copy of (plain) Lua 5.1 or 5.2, plus Lua BitOp. E.g. with: HOST_LUA=lua |
| 201 | HOST_LUA= | 201 | HOST_LUA= |