Changeset 8bdc1c3


Ignore:
Timestamp:
Aug 20, 2018, 12:52:03 PM (3 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer
Children:
341bb80
Parents:
b215e92b
Message:

Now using rpath to handle shared libraries instead of LD_LIBRARY_PATH

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • driver/cfa.cc

    rb215e92b r8bdc1c3  
    416416                args[nargs] = ( *new string( string("-L" ) + libdir + (intree ? "/src/.libs" : "")) ).c_str();
    417417                nargs += 1;
     418                args[nargs] = ( *new string( string("-Wl,-rpath," ) + libdir + (intree ? "/src/.libs" : "")) ).c_str();
     419                nargs += 1;
    418420                args[nargs] = "-lcfa";
    419421                nargs += 1;
  • tests/pybin/settings.py

    rb215e92b r8bdc1c3  
    112112        global install
    113113        global timeout
    114         global ldpath
    115114
    116115        dry_run    = options.dry_run
     
    121120        arch       = Architecture(options.arch)
    122121        timeout    = Timeouts(options.timeout, options.global_timeout)
    123         ldpath     = "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH:%s/../libcfa/%s-%s/src/.libs\"" % (BUILDDIR, arch.string, "debug" if options.debug else "nodebug")
    124122
    125123
  • tests/test.py

    rb215e92b r8bdc1c3  
    162162                if settings.dry_run or fileIsExecutable(exe_file) :
    163163                        # run test
    164                         retcode, _ = sh("%s timeout %d %s > %s 2>&1" % (settings.ldpath, settings.timeout.single, exe_file, out_file), input = in_file)
     164                        retcode, _ = sh("timeout %d %s > %s 2>&1" % (settings.timeout.single, exe_file, out_file), input = in_file)
    165165                else :
    166166                        # simply cat the result into the output
Note: See TracChangeset for help on using the changeset viewer.