diff options
| author | Mike Pall <mike> | 2019-01-10 12:02:31 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2019-01-10 12:02:31 +0100 |
| commit | e2cc89b19096a3e32b8be8d34e0df8c6e71beec4 (patch) | |
| tree | ece9224e58eb66f3a51579744752204e5642f3fb /src | |
| parent | 0a9ff94c4a1fcec2c310dcb092da694f23186e23 (diff) | |
| parent | 3404183e2387f48e3464bd79116d3e8021ca781e (diff) | |
| download | luajit-e2cc89b19096a3e32b8be8d34e0df8c6e71beec4.tar.gz luajit-e2cc89b19096a3e32b8be8d34e0df8c6e71beec4.tar.bz2 luajit-e2cc89b19096a3e32b8be8d34e0df8c6e71beec4.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/Makefile b/src/Makefile index 71ca028c..a5490b4b 100644 --- a/src/Makefile +++ b/src/Makefile | |||
| @@ -165,6 +165,10 @@ else | |||
| 165 | HOST_SYS= Windows | 165 | HOST_SYS= Windows |
| 166 | HOST_MSYS= mingw | 166 | HOST_MSYS= mingw |
| 167 | endif | 167 | endif |
| 168 | ifneq (,$(findstring MSYS,$(HOST_SYS))) | ||
| 169 | HOST_SYS= Windows | ||
| 170 | HOST_MSYS= mingw | ||
| 171 | endif | ||
| 168 | ifneq (,$(findstring CYGWIN,$(HOST_SYS))) | 172 | ifneq (,$(findstring CYGWIN,$(HOST_SYS))) |
| 169 | HOST_SYS= Windows | 173 | HOST_SYS= Windows |
| 170 | HOST_MSYS= cygwin | 174 | HOST_MSYS= cygwin |