diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2014-06-28 13:02:32 +0200 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2014-06-28 13:02:32 +0200 |
| commit | 579be9445d57b5da59d6651baffdb0c744c4c309 (patch) | |
| tree | fed74d0669126fa2c8d44eeac74188372d7b8d9f /Makefile.rules | |
| parent | e14f1e044839fba347babb41259f89867bac4d46 (diff) | |
| parent | 5c6aa738fb3325ae499454877f1e2926d2368135 (diff) | |
| download | llvm-embtk-support-release-3.4.tar.gz llvm-embtk-support-release-3.4.tar.bz2 llvm-embtk-support-release-3.4.tar.xz | |
Merge branch 'release-3.4' into embtk-support-release-3.4embtk-support-release-3.4
Diffstat (limited to 'Makefile.rules')
| -rw-r--r-- | Makefile.rules | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/Makefile.rules b/Makefile.rules index 210abdafc8..fde77f9acf 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -1027,8 +1027,9 @@ ifeq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW)) LLVMLibsOptions += -Wl,--enable-auto-import,--enable-runtime-pseudo-reloc \ -L $(SharedLibDir) endif -LLVMLibsOptions += -lLLVM-$(LLVMVersion) -LLVMLibsPaths += $(SharedLibDir)/$(SharedPrefix)LLVM-$(LLVMVersion)$(SHLIBEXT) +LLVM_SO_NAME = LLVM-$(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)$(LLVM_VERSION_SUFFIX) +LLVMLibsOptions += -l$(LLVM_SO_NAME) +LLVMLibsPaths += $(SharedLibDir)/$(SharedPrefix)$(LLVM_SO_NAME)$(SHLIBEXT) else ifndef NO_LLVM_CONFIG @@ -1144,7 +1145,12 @@ LibName.O := $(LibDir)/$(LIBRARYNAME).o #--------------------------------------------------------- ifdef SHARED_LIBRARY -all-local:: $(LibName.SO) +all-local:: $(AliasName.SO) + +$(AliasName.SO): $(LibName.SO) +ifdef SHARED_ALIAS + $(Verb) $(AliasTool) $(BaseLibName.SO) $(AliasName.SO) +endif ifdef EXPORTED_SYMBOL_FILE $(LibName.SO): $(NativeExportsFile) @@ -1196,12 +1202,15 @@ $(DestSharedLib): $(LibName.SO) $(DestSharedLibDir) $(Verb) $(INSTALL) $(LibName.SO) $(DestSharedLib) ifdef SHARED_ALIAS $(Echo) Creating alias from $(DestSharedLib) to $(DestSharedAlias) - $(Verb) $(AliasTool) $(DestSharedLib) $(DestSharedAlias) + $(Verb) $(AliasTool) $(BaseLibName.SO) $(DestSharedAlias) endif uninstall-local:: $(Echo) Uninstalling $(BuildMode) Shared Library $(DestSharedLib) -$(Verb) $(RM) -f $(DestSharedLib) +ifdef SHARED_ALIAS + -$(Verb) $(RM) -f $(DestSharedAlias) +endif endif endif |