Versionize for parallel installation with newer llvm
[git/cygwin-packages/llvm3.5.git] / 3.4.2-cygwin-implib.patch
1 --- origsrc/llvm-3.4.2.src/Makefile.rules 2014-05-15 15:56:00.000000000 -0500
2 +++ src/llvm-3.4.2.src/Makefile.rules 2014-07-18 00:00:53.210529100 -0500
3 @@ -1109,6 +1109,9 @@ endif
4 ifeq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
5 # LLVMLibsOptions is invalidated at processing tools/llvm-shlib.
6 SharedLinkOptions += $(NativeExportsFile)
7 +ifndef LOADABLE_MODULE
8 +SharedLinkOptions += -Wl,--out-implib,$(SharedLibDir)/lib$(LIBRARYNAME).dll.a
9 +endif
10 endif
11
12 endif
13 @@ -1204,6 +1207,11 @@ ifdef SHARED_ALIAS
14 $(Echo) Creating alias from $(DestSharedLib) to $(DestSharedAlias)
15 $(Verb) $(AliasTool) $(BaseLibName.SO) $(DestSharedAlias)
16 endif
17 +ifndef LOADABLE_MODULE
18 +ifeq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
19 + $(Verb) $(INSTALL) $(SharedLibDir)/lib$(LIBRARYNAME).dll.a $(DESTDIR)$(PROJ_libdir)
20 +endif
21 +endif
22
23 uninstall-local::
24 $(Echo) Uninstalling $(BuildMode) Shared Library $(DestSharedLib)
25 --- origsrc/llvm-3.4.2.src/tools/llvm-shlib/Makefile 2014-05-14 19:15:27.000000000 -0500
26 +++ src/llvm-3.4.2.src/tools/llvm-shlib/Makefile 2014-07-21 19:24:10.874237900 -0500
27 @@ -91,6 +91,10 @@ SHLIB_STUBS := $(addprefix $(ObjDir)/, $
28 SHLIB_FRAGS := $(patsubst %.a.o, $(ObjDir)/%.syms.txt, $(LIBRARYNAME).a.o $(SHLIB_FRAG_NAMES))
29 LLVMLibsOptions := $(SHLIB_STUBS) $(LLVMLibsOptions)
30
31 +ifneq ($(HOST_ARCH), x86_64)
32 + SYMBOL_PREFIX = _
33 +endif
34 +
35 $(LibName.SO): $(SHLIB_STUBS)
36
37 %.syms.txt: %.a.o
38 @@ -100,8 +104,8 @@ $(LibName.SO): $(SHLIB_STUBS)
39 $(ObjDir)/$(LIBRARYNAME).exports: $(SHLIB_FRAGS) $(ObjDir)/.dir
40 $(Echo) Generating exports for $(LIBRARYNAME)
41 $(Verb) ($(SED) -n \
42 - -e "s/^.* T _\([^.][^.]*\)$$/\1/p" \
43 - -e "s/^.* [BDR] _\([^.][^.]*\)$$/\1 DATA/p" \
44 + -e "s/^.* T $(SYMBOL_PREFIX)\([^.][^.]*\)$$/\1/p" \
45 + -e "s/^.* [BDR] $(SYMBOL_PREFIX)\([^.][^.]*\)$$/\1 DATA/p" \
46 $(SHLIB_FRAGS) \
47 | sort -u) > $@
48
This page took 0.034182 seconds and 5 git commands to generate.