summaryrefslogtreecommitdiff
path: root/src/Makefile
diff options
context:
space:
mode:
authorMike Pall <mike>2017-03-08 23:04:46 +0100
committerMike Pall <mike>2017-03-08 23:04:46 +0100
commitd3e36e7920c641410dfcdf1fc6c10069fd3192a6 (patch)
tree04ae8ac89a49d1017171f293eff8e4bfbd2a547b /src/Makefile
parenta25c0b99b84558887887b8e298409dcf8605e5e3 (diff)
parentf50bf7585a32738c4fb719cb8fc59d02231fc8c3 (diff)
downloadluajit-d3e36e7920c641410dfcdf1fc6c10069fd3192a6.tar.gz
luajit-d3e36e7920c641410dfcdf1fc6c10069fd3192a6.tar.bz2
luajit-d3e36e7920c641410dfcdf1fc6c10069fd3192a6.zip
Merge branch 'master' into v2.1
Diffstat (limited to 'src/Makefile')
-rw-r--r--src/Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/Makefile b/src/Makefile
index 5a2277cc..7cb4c14a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -209,7 +209,7 @@ TARGET_CC= $(STATIC_CC)
209TARGET_STCC= $(STATIC_CC) 209TARGET_STCC= $(STATIC_CC)
210TARGET_DYNCC= $(DYNAMIC_CC) 210TARGET_DYNCC= $(DYNAMIC_CC)
211TARGET_LD= $(CROSS)$(CC) 211TARGET_LD= $(CROSS)$(CC)
212TARGET_AR= $(CROSS)ar rcus 212TARGET_AR= $(CROSS)ar rcus 2>/dev/null
213TARGET_STRIP= $(CROSS)strip 213TARGET_STRIP= $(CROSS)strip
214 214
215TARGET_LIBPATH= $(or $(PREFIX),/usr/local)/$(or $(MULTILIB),lib) 215TARGET_LIBPATH= $(or $(PREFIX),/usr/local)/$(or $(MULTILIB),lib)
@@ -313,7 +313,6 @@ ifeq (Darwin,$(TARGET_SYS))
313 export MACOSX_DEPLOYMENT_TARGET=10.4 313 export MACOSX_DEPLOYMENT_TARGET=10.4
314 endif 314 endif
315 TARGET_STRIP+= -x 315 TARGET_STRIP+= -x
316 TARGET_AR+= 2>/dev/null
317 TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC 316 TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC
318 TARGET_DYNXLDOPTS= 317 TARGET_DYNXLDOPTS=
319 TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).$(RELVER) 318 TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).$(RELVER)
@@ -324,7 +323,6 @@ ifeq (Darwin,$(TARGET_SYS))
324else 323else
325ifeq (iOS,$(TARGET_SYS)) 324ifeq (iOS,$(TARGET_SYS))
326 TARGET_STRIP+= -x 325 TARGET_STRIP+= -x
327 TARGET_AR+= 2>/dev/null
328 TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC 326 TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC
329 TARGET_DYNXLDOPTS= 327 TARGET_DYNXLDOPTS=
330 TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).$(RELVER) 328 TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).$(RELVER)