projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add missing newlines at EOF (for clang++).
[oota-llvm.git]
/
tools
/
lto
/
Makefile
diff --git
a/tools/lto/Makefile
b/tools/lto/Makefile
index 45fa69cd8704ee4ae2ace15fbfb9f400ba95cf0f..3120aa52c953afb7e778081652fa7acc7bab8f18 100644
(file)
--- a/
tools/lto/Makefile
+++ b/
tools/lto/Makefile
@@
-1,4
+1,4
@@
-##===- tools/lto
2/Makefile
---------------------------------*- Makefile -*-===##
+##===- tools/lto
/Makefile -
---------------------------------*- Makefile -*-===##
#
# The LLVM Compiler Infrastructure
#
#
# The LLVM Compiler Infrastructure
#
@@
-12,23
+12,17
@@
LIBRARYNAME = LTO
# Include this here so we can get the configuration of the targets
# that have been configured for construction. We have to do this
# Include this here so we can get the configuration of the targets
# that have been configured for construction. We have to do this
-# early so we can set up LINK_COMPONENTS before includ
e
ing Makefile.rules
+# early so we can set up LINK_COMPONENTS before including Makefile.rules
include $(LEVEL)/Makefile.config
LINK_LIBS_IN_SHARED = 1
include $(LEVEL)/Makefile.config
LINK_LIBS_IN_SHARED = 1
-ifeq ($(OS),Darwin)
- SHARED_LIBRARY = 1
- BUILD_ARCHIVE = 0
- DONT_BUILD_RELINKED = 1
-else
- BUILD_ARCHIVE = 1
-endif
+SHARED_LIBRARY = 1
LINK_COMPONENTS := $(TARGETS_TO_BUILD) ipo scalaropts linker bitreader bitwriter
include $(LEVEL)/Makefile.common
LINK_COMPONENTS := $(TARGETS_TO_BUILD) ipo scalaropts linker bitreader bitwriter
include $(LEVEL)/Makefile.common
-ifeq ($(OS),Darwin)
+ifeq ($(
HOST_
OS),Darwin)
# set dylib internal version number to llvmCore submission number
ifdef LLVM_SUBMIT_VERSION
LLVMLibsOptions := $(LLVMLibsOptions) -Wl,-current_version \
# set dylib internal version number to llvmCore submission number
ifdef LLVM_SUBMIT_VERSION
LLVMLibsOptions := $(LLVMLibsOptions) -Wl,-current_version \
@@
-37,7
+31,7
@@
ifeq ($(OS),Darwin)
endif
# extra options to override libtool defaults
LLVMLibsOptions := $(LLVMLibsOptions) \
endif
# extra options to override libtool defaults
LLVMLibsOptions := $(LLVMLibsOptions) \
- -
no-undefined -
avoid-version \
+ -avoid-version \
-Wl,-exported_symbols_list -Wl,$(PROJ_SRC_DIR)/lto.exports \
-Wl,-dead_strip \
-Wl,-seg1addr -Wl,0xE0000000
-Wl,-exported_symbols_list -Wl,$(PROJ_SRC_DIR)/lto.exports \
-Wl,-dead_strip \
-Wl,-seg1addr -Wl,0xE0000000
@@
-46,8
+40,7
@@
ifeq ($(OS),Darwin)
DARWIN_VERS := $(shell echo $(TARGET_TRIPLE) | sed 's/.*darwin\([0-9]*\).*/\1/')
ifneq ($(DARWIN_VERS),8)
LLVMLibsOptions := $(LLVMLibsOptions) \
DARWIN_VERS := $(shell echo $(TARGET_TRIPLE) | sed 's/.*darwin\([0-9]*\).*/\1/')
ifneq ($(DARWIN_VERS),8)
LLVMLibsOptions := $(LLVMLibsOptions) \
- -Wl,-install_name \
+ -
no-undefined -
Wl,-install_name \
-Wl,"@executable_path/../lib/lib$(LIBRARYNAME)$(SHLIBEXT)"
endif
-Wl,"@executable_path/../lib/lib$(LIBRARYNAME)$(SHLIBEXT)"
endif
-
endif
endif