diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2010-07-31 21:32:56 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2010-07-31 21:32:56 +0000 |
| commit | 40842fa2ee2d2b30ea4dd3469d4cbe418ec8fdf4 (patch) | |
| tree | c0fd03515216d5c56785613b32f284b9f967ff88 | |
| parent | 727be43a3d6cc98ef636ef64a744d6e7f23b51fd (diff) | |
| download | bcm5719-llvm-40842fa2ee2d2b30ea4dd3469d4cbe418ec8fdf4.tar.gz bcm5719-llvm-40842fa2ee2d2b30ea4dd3469d4cbe418ec8fdf4.zip | |
build: Don't pass -avoid-version or -no-undefined on Darwin, they don't do
anything.
llvm-svn: 109957
| -rw-r--r-- | llvm/tools/edis/Makefile | 3 | ||||
| -rw-r--r-- | llvm/tools/llvm-shlib/Makefile | 1 | ||||
| -rw-r--r-- | llvm/tools/lto/Makefile | 3 |
3 files changed, 2 insertions, 5 deletions
diff --git a/llvm/tools/edis/Makefile b/llvm/tools/edis/Makefile index ff0e1a57a38..92484bf0ac4 100644 --- a/llvm/tools/edis/Makefile +++ b/llvm/tools/edis/Makefile @@ -36,7 +36,6 @@ include $(LEVEL)/Makefile.common ifeq ($(HOST_OS),Darwin) # extra options to override libtool defaults LLVMLibsOptions := $(LLVMLibsOptions) \ - -avoid-version \ -Wl,-dead_strip ifdef EDIS_VERSION @@ -48,7 +47,7 @@ ifeq ($(HOST_OS),Darwin) DARWIN_VERS := $(shell echo $(TARGET_TRIPLE) | sed 's/.*darwin\([0-9]*\).*/\1/') ifneq ($(DARWIN_VERS),8) LLVMLibsOptions := $(LLVMLibsOptions) \ - -no-undefined -Wl,-install_name \ + -Wl,-install_name \ -Wl,"@rpath/lib$(LIBRARYNAME)$(SHLIBEXT)" endif endif diff --git a/llvm/tools/llvm-shlib/Makefile b/llvm/tools/llvm-shlib/Makefile index ce29bf809e6..899406c8416 100644 --- a/llvm/tools/llvm-shlib/Makefile +++ b/llvm/tools/llvm-shlib/Makefile @@ -38,7 +38,6 @@ ifeq ($(HOST_OS),Darwin) LLVMLibsOptions := $(LLVMLibsOptions) -all_load # extra options to override libtool defaults LLVMLibsOptions := $(LLVMLibsOptions) \ - -avoid-version \ -Wl,-dead_strip \ -Wl,-seg1addr -Wl,0xE0000000 diff --git a/llvm/tools/lto/Makefile b/llvm/tools/lto/Makefile index f3fb79e6823..e157a4c48ac 100644 --- a/llvm/tools/lto/Makefile +++ b/llvm/tools/lto/Makefile @@ -41,7 +41,6 @@ ifeq ($(HOST_OS),Darwin) endif # extra options to override libtool defaults LLVMLibsOptions := $(LLVMLibsOptions) \ - -avoid-version \ -Wl,-dead_strip \ -Wl,-seg1addr -Wl,0xE0000000 @@ -49,7 +48,7 @@ ifeq ($(HOST_OS),Darwin) DARWIN_VERS := $(shell echo $(TARGET_TRIPLE) | sed 's/.*darwin\([0-9]*\).*/\1/') ifneq ($(DARWIN_VERS),8) LLVMLibsOptions := $(LLVMLibsOptions) \ - -no-undefined -Wl,-install_name \ + -Wl,-install_name \ -Wl,"@executable_path/../lib/lib$(LIBRARYNAME)$(SHLIBEXT)" endif endif |
