[llvm-branch-commits] [llvm-branch] r195871 - Merging r195782:

[Bill Wendling]

Author: void
Date: Wed Nov 27 13:42:48 2013
New Revision: 195871

URL: http://llvm.org/viewvc/llvm-project?rev=195871&view=rev
Log:
Merging r195782:
------------------------------------------------------------------------
r195782 | whitequark | 2013-11-26 12:40:34 -0800 (Tue, 26 Nov 2013) | 1 line

[OCaml] Embed the flags necessary for linking with libLLVM.so into .cmxa files
------------------------------------------------------------------------

Modified:
    llvm/branches/release_34/   (props changed)
    llvm/branches/release_34/bindings/ocaml/Makefile.ocaml

Propchange: llvm/branches/release_34/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 27 13:42:48 2013
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,195092-195094,195100,195102-195103,195118,195129,195136,195138,195148,195152,195156-195157,195161-195162,195193,195272,195317-195318,195327,195330,195333,195339,195343,195355,195364,195379,195397-195399,195408,195421,195423-195424,195432,195439,195444,195455-195456,195469,195476-195477,195479,195491-195493,195514,195528,195547,195567,195573-195576,195591,195599,195632,195635-195636,195670,195679,195682,195684,195713,195716,195769,195773,195779,195791,195798
+/llvm/trunk:155241,195092-195094,195100,195102-195103,195118,195129,195136,195138,195148,195152,195156-195157,195161-195162,195193,195272,195317-195318,195327,195330,195333,195339,195343,195355,195364,195379,195397-195399,195408,195421,195423-195424,195432,195439,195444,195455-195456,195469,195476-195477,195479,195491-195493,195514,195528,195547,195567,195573-195576,195591,195599,195632,195635-195636,195670,195679,195682,195684,195713,195716,195769,195773,195779,195782,195791,195798

Modified: llvm/branches/release_34/bindings/ocaml/Makefile.ocaml
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_34/bindings/ocaml/Makefile.ocaml?rev=195871&r1=195870&r2=195871&view=diff
==============================================================================
--- llvm/branches/release_34/bindings/ocaml/Makefile.ocaml (original)
+++ llvm/branches/release_34/bindings/ocaml/Makefile.ocaml Wed Nov 27 13:42:48 2013
@@ -89,6 +89,7 @@ endif
 ifdef OCAMLSTUBS
 Archive.CMXA := $(strip $(OCAMLOPT) -a $(patsubst %,-cclib %, \
                                     $(LLVMLibsOptions) -l$(LIBRARYNAME)) \
+                                    -cclib -L$(SharedLibDir) \
                                     $(OCAMLDEBUGFLAG) -o)
 else
 Archive.CMXA := $(strip $(OCAMLOPT) -a $(OCAMLAFLAGS) $(OCAMLDEBUGFLAG) -o)