projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[SystemZ] Add test missing from r186148
[oota-llvm.git]
/
tools
/
llvm-shlib
/
Makefile
diff --git
a/tools/llvm-shlib/Makefile
b/tools/llvm-shlib/Makefile
index 0695c0070d36b028d47a862f6f5050b7bfa6147a..9498a27d77b9efd5f313d02c9f27aef2ff7f8256 100644
(file)
--- a/
tools/llvm-shlib/Makefile
+++ b/
tools/llvm-shlib/Makefile
@@
-7,13
+7,13
@@
#
##===----------------------------------------------------------------------===##
#
##===----------------------------------------------------------------------===##
-LEVEL = ../..
+LEVEL
:
= ../..
LIBRARYNAME = LLVM-$(LLVMVersion)
LIBRARYNAME = LLVM-$(LLVMVersion)
-NO_BUILD_ARCHIVE = 1
-LINK_LIBS_IN_SHARED = 1
-SHARED_LIBRARY = 1
+NO_BUILD_ARCHIVE
:
= 1
+LINK_LIBS_IN_SHARED
:
= 1
+SHARED_LIBRARY
:
= 1
include $(LEVEL)/Makefile.config
include $(LEVEL)/Makefile.config
@@
-51,8
+51,7
@@
ifeq ($(HOST_OS),Darwin)
LLVMLibsOptions := $(LLVMLibsOptions) -all_load
# extra options to override libtool defaults
LLVMLibsOptions := $(LLVMLibsOptions) \
LLVMLibsOptions := $(LLVMLibsOptions) -all_load
# extra options to override libtool defaults
LLVMLibsOptions := $(LLVMLibsOptions) \
- -Wl,-dead_strip \
- -Wl,-seg1addr -Wl,0xE0000000
+ -Wl,-dead_strip
# Mac OS X 10.4 and earlier tools do not allow a second -install_name on command line
DARWIN_VERS := $(shell echo $(TARGET_TRIPLE) | sed 's/.*darwin\([0-9]*\).*/\1/')
# Mac OS X 10.4 and earlier tools do not allow a second -install_name on command line
DARWIN_VERS := $(shell echo $(TARGET_TRIPLE) | sed 's/.*darwin\([0-9]*\).*/\1/')
@@
-63,13
+62,18
@@
ifeq ($(HOST_OS),Darwin)
endif
endif
endif
endif
-ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD
OpenBSD
))
+ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD
GNU/kFreeBSD OpenBSD GNU Bitrig
))
# Include everything from the .a's into the shared library.
LLVMLibsOptions := -Wl,--whole-archive $(LLVMLibsOptions) \
-Wl,--no-whole-archive
endif
# Include everything from the .a's into the shared library.
LLVMLibsOptions := -Wl,--whole-archive $(LLVMLibsOptions) \
-Wl,--no-whole-archive
endif
-ifeq ($(HOST_OS),Linux)
+ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU/kFreeBSD GNU))
+ # Add soname to the library.
+ LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT)
+endif
+
+ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux GNU GNU/kFreeBSD))
# Don't allow unresolved symbols.
LLVMLibsOptions += -Wl,--no-undefined
endif
# Don't allow unresolved symbols.
LLVMLibsOptions += -Wl,--no-undefined
endif