projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Track blocks visited in reverse postorder.
[oota-llvm.git]
/
Makefile.rules
diff --git
a/Makefile.rules
b/Makefile.rules
index 86730e713992049b1e16cdb4c35ef03770028778..c0a9112c31beeac006ada98a80d0b97cdedb959d 100644
(file)
--- a/
Makefile.rules
+++ b/
Makefile.rules
@@
-507,8
+507,8
@@
ifeq ($(HOST_OS),Darwin)
# Get "4" out of 10.4 for later pieces in the makefile.
DARWIN_MAJVERS := $(shell echo $(DARWIN_VERSION)| sed -E 's/10.([0-9]).*/\1/')
# Get "4" out of 10.4 for later pieces in the makefile.
DARWIN_MAJVERS := $(shell echo $(DARWIN_VERSION)| sed -E 's/10.([0-9]).*/\1/')
- SharedLinkOptions=-Wl,-flat_namespace -Wl,-undefined,suppress \
-
-dynamiclib
+ LoadableModuleOptions := -Wl,-flat_namespace -Wl,-undefined,suppress
+
SharedLinkOptions :=
-dynamiclib
ifneq ($(ARCH),ARM)
SharedLinkOptions += -mmacosx-version-min=$(DARWIN_VERSION)
endif
ifneq ($(ARCH),ARM)
SharedLinkOptions += -mmacosx-version-min=$(DARWIN_VERSION)
endif
@@
-526,10
+526,6
@@
ifdef SHARED_LIBRARY
ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
ifneq ($(HOST_OS),Darwin)
LD.Flags += $(RPATH) -Wl,'$$ORIGIN'
ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
ifneq ($(HOST_OS),Darwin)
LD.Flags += $(RPATH) -Wl,'$$ORIGIN'
-else
-ifneq ($(DARWIN_MAJVERS),4)
- LD.Flags += $(RPATH) -Wl,$(SharedLibDir)
-endif
endif
endif
endif
endif
endif
endif
@@
-844,7
+840,9
@@
$(RecursiveTargets)::
else
$(RecursiveTargets)::
$(Verb) for dir in $(OPTIONAL_DIRS); do \
else
$(RecursiveTargets)::
$(Verb) for dir in $(OPTIONAL_DIRS); do \
- ($(MAKE) -C$$dir $@ ) || exit 1; \
+ if [ -d $(PROJ_SRC_DIR)/$$dir ]; then\
+ ($(MAKE) -C$$dir $@ ) || exit 1; \
+ fi \
done
endif
endif
done
endif
endif
@@
-975,7
+973,9
@@
$(NativeExportsFile): $(EXPORTED_SYMBOL_FILE) $(ObjDir)/.dir
$(Verb) echo "{" > $@
$(Verb) grep -q "\<" $< && echo " global:" >> $@ || :
$(Verb) sed -e 's/$$/;/' -e 's/^/ /' < $< >> $@
$(Verb) echo "{" > $@
$(Verb) grep -q "\<" $< && echo " global:" >> $@ || :
$(Verb) sed -e 's/$$/;/' -e 's/^/ /' < $< >> $@
+ifneq ($(HOST_OS),OpenBSD)
$(Verb) echo " local: *;" >> $@
$(Verb) echo " local: *;" >> $@
+endif
$(Verb) echo "};" >> $@
clean-local::
-$(Verb) $(RM) -f $(NativeExportsFile)
$(Verb) echo "};" >> $@
clean-local::
-$(Verb) $(RM) -f $(NativeExportsFile)
@@
-1087,12
+1087,14
@@
ifdef LIBRARYNAME
# Make sure there isn't any extraneous whitespace on the LIBRARYNAME option
LIBRARYNAME := $(strip $(LIBRARYNAME))
ifdef LOADABLE_MODULE
# Make sure there isn't any extraneous whitespace on the LIBRARYNAME option
LIBRARYNAME := $(strip $(LIBRARYNAME))
ifdef LOADABLE_MODULE
-
LibName.A := $(LibDir)/
$(LIBRARYNAME).a
-
LibName.SO := $(SharedLibDir)/
$(LIBRARYNAME)$(SHLIBEXT)
+
BaseLibName.A :=
$(LIBRARYNAME).a
+
BaseLibName.SO :=
$(LIBRARYNAME)$(SHLIBEXT)
else
else
-
LibName.A := $(LibDir)/
lib$(LIBRARYNAME).a
-
LibName.SO := $(SharedLibDir)/
$(SharedPrefix)$(LIBRARYNAME)$(SHLIBEXT)
+
BaseLibName.A :=
lib$(LIBRARYNAME).a
+
BaseLibName.SO :=
$(SharedPrefix)$(LIBRARYNAME)$(SHLIBEXT)
endif
endif
+LibName.A := $(LibDir)/$(BaseLibName.A)
+LibName.SO := $(SharedLibDir)/$(BaseLibName.SO)
LibName.O := $(LibDir)/$(LIBRARYNAME).o
LibName.BCA:= $(LibDir)/lib$(LIBRARYNAME).bca
LibName.O := $(LibDir)/$(LIBRARYNAME).o
LibName.BCA:= $(LibDir)/lib$(LIBRARYNAME).bca
@@
-1113,6
+1115,7
@@
endif
ifdef LINK_LIBS_IN_SHARED
ifdef LOADABLE_MODULE
SharedLibKindMessage := "Loadable Module"
ifdef LINK_LIBS_IN_SHARED
ifdef LOADABLE_MODULE
SharedLibKindMessage := "Loadable Module"
+SharedLinkOptions := $(LoadableModuleOptions) $(SharedLinkOptions)
else
SharedLibKindMessage := "Shared Library"
endif
else
SharedLibKindMessage := "Shared Library"
endif
@@
-1145,7
+1148,7
@@
DestSharedLibDir := $(DESTDIR)$(PROJ_bindir)
else
DestSharedLibDir := $(DESTDIR)$(PROJ_libdir)
endif
else
DestSharedLibDir := $(DESTDIR)$(PROJ_libdir)
endif
-DestSharedLib := $(DestSharedLibDir)/$(
SharedPrefix)$(LIBRARYNAME)$(SHLIBEXT
)
+DestSharedLib := $(DestSharedLibDir)/$(
BaseLibName.SO
)
install-local:: $(DestSharedLib)
install-local:: $(DestSharedLib)