diff options
| author | Mike Pall <mike> | 2011-06-14 16:44:20 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2011-06-14 16:44:20 +0200 |
| commit | 3d1563524f3b6bc2313ff948efa8a6d3a45c11a3 (patch) | |
| tree | 3ccf362fe892b54f00d693e9b0246c5dea28527a /src/Makefile | |
| parent | 9cf2cd2a1177ea7529890e6004d94fb092a7c92a (diff) | |
| download | luajit-3d1563524f3b6bc2313ff948efa8a6d3a45c11a3.tar.gz luajit-3d1563524f3b6bc2313ff948efa8a6d3a45c11a3.tar.bz2 luajit-3d1563524f3b6bc2313ff948efa8a6d3a45c11a3.zip | |
More fixes for the Solaris/x86 build. Thanks to Will Metcalf.
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile index e670953b..9f7bcfcc 100644 --- a/src/Makefile +++ b/src/Makefile | |||
| @@ -292,7 +292,9 @@ ifeq (iOS,$(TARGET_SYS)) | |||
| 292 | TARGET_XSHLDFLAGS+= -install_name $(PREFIX)/lib/$(TARGET_DYLIBNAME) | 292 | TARGET_XSHLDFLAGS+= -install_name $(PREFIX)/lib/$(TARGET_DYLIBNAME) |
| 293 | endif | 293 | endif |
| 294 | else | 294 | else |
| 295 | TARGET_XLDFLAGS+= -Wl,-E | 295 | ifneq (SunOS,$(TARGET_SYS)) |
| 296 | TARGET_XLDFLAGS+= -Wl,-E | ||
| 297 | endif | ||
| 296 | ifeq (Linux,$(TARGET_SYS)) | 298 | ifeq (Linux,$(TARGET_SYS)) |
| 297 | TARGET_XLIBS+= -ldl | 299 | TARGET_XLIBS+= -ldl |
| 298 | endif | 300 | endif |
| @@ -420,6 +422,9 @@ endif | |||
| 420 | ifeq (iOS,$(TARGET_SYS)) | 422 | ifeq (iOS,$(TARGET_SYS)) |
| 421 | LJVM_MODE= machasm | 423 | LJVM_MODE= machasm |
| 422 | endif | 424 | endif |
| 425 | ifeq (SunOS,$(TARGET_SYS)) | ||
| 426 | BUILDMODE= static | ||
| 427 | endif | ||
| 423 | 428 | ||
| 424 | ifeq (static,$(BUILDMODE)) | 429 | ifeq (static,$(BUILDMODE)) |
| 425 | TARGET_DYNCC= @: | 430 | TARGET_DYNCC= @: |
