Changeset e99e43f for driver/cfa.cc

Timestamp:

Jan 10, 2019, 3:50:34 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

d97c3a4

Parents:

aeb8f70 (diff), 08222c7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Aaron Moss <a3moss@…> (01/10/19 14:46:09)

git-committer:

Aaron Moss <a3moss@…> (01/10/19 15:50:34)

Message:

Merge remote-tracking branch 'plg/master' into deferred_resn

File:

• driver/cfa.cc (modified) (1 diff)

driver/cfa.cc

@@ -403 +403 @@
 
                 // include the cfa library in case it's needed
-                args[nargs] = ( *new string( string("-L" ) + libdir + (intree ? "/src" : "")) ).c_str();
+                args[nargs] = ( *new string( string("-L" ) + libdir + (intree ? "/src/.libs" : "")) ).c_str();
+                nargs += 1;
+                args[nargs] = ( *new string( string("-Wl,-rpath," ) + libdir + (intree ? "/src/.libs" : "")) ).c_str();
                 nargs += 1;
                 args[nargs] = "-lcfa";