diff options
author | Mike Pall <mike> | 2023-09-09 23:20:57 +0200 |
---|---|---|
committer | Mike Pall <mike> | 2023-09-09 23:20:57 +0200 |
commit | 566532b8071c82125a65ad1bea0d5784991fa7a2 (patch) | |
tree | 208e1a2ba19eebfe13ca73c24d5a10651b7dbf4c /src/Makefile | |
parent | 4611e25c0fbe911486cccae4556eb086c0254c5f (diff) | |
parent | 4fe200229289c43868442ba344a71f4ff847bfe1 (diff) | |
download | luajit-566532b8071c82125a65ad1bea0d5784991fa7a2.tar.gz luajit-566532b8071c82125a65ad1bea0d5784991fa7a2.tar.bz2 luajit-566532b8071c82125a65ad1bea0d5784991fa7a2.zip |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/Makefile')
-rw-r--r-- | src/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile index 79340a96..224d21e7 100644 --- a/src/Makefile +++ b/src/Makefile | |||
@@ -233,7 +233,7 @@ TARGET_ALDFLAGS= $(LDOPTIONS) $(TARGET_XLDFLAGS) $(TARGET_FLAGS) $(TARGET_LDFLAG | |||
233 | TARGET_ASHLDFLAGS= $(LDOPTIONS) $(TARGET_XSHLDFLAGS) $(TARGET_FLAGS) $(TARGET_SHLDFLAGS) | 233 | TARGET_ASHLDFLAGS= $(LDOPTIONS) $(TARGET_XSHLDFLAGS) $(TARGET_FLAGS) $(TARGET_SHLDFLAGS) |
234 | TARGET_ALIBS= $(TARGET_XLIBS) $(LIBS) $(TARGET_LIBS) | 234 | TARGET_ALIBS= $(TARGET_XLIBS) $(LIBS) $(TARGET_LIBS) |
235 | 235 | ||
236 | TARGET_TESTARCH=$(shell $(TARGET_CC) $(TARGET_TCFLAGS) -E lj_arch.h -dM) | 236 | TARGET_TESTARCH:=$(shell $(TARGET_CC) $(TARGET_TCFLAGS) -E lj_arch.h -dM) |
237 | ifneq (,$(findstring LJ_TARGET_X64 ,$(TARGET_TESTARCH))) | 237 | ifneq (,$(findstring LJ_TARGET_X64 ,$(TARGET_TESTARCH))) |
238 | TARGET_LJARCH= x64 | 238 | TARGET_LJARCH= x64 |
239 | else | 239 | else |