Changeset e75b753


Ignore:
Timestamp:
Jun 27, 2021, 10:07:16 PM (7 months ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
jacob/cs343-translation, master, new-ast-unique-expr
Children:
1781e97, 44b37de
Parents:
2ac218d (diff), 22a4292 (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.
Message:

fix conflict

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • INSTALL

    r2ac218d re75b753  
    99
    1010  $ ./autogen.sh
    11   $ ./configure
     11  $ ./configure [ --prefix=/some/directory ]
    1212  $ make -j 8 install
    1313
    14 For users using the distributed tarball:
     14For users using the distributed tarball / github:
    1515
    1616  $ ./configure
     
    2020
    2121
    22 Options for 'configure'
     22Options for configure
    2323======================================
    24 The script 'configure' accepts many command line arguments.  Run './configure
    25 --help' to see a list of all of them.  This document attempts to summarize the
    26 most useful arguments.
     24The script 'configure' accepts many command-line arguments.  Run
    2725
    28 --prefix=/some/directory controls the path prefix common to all installed
    29   cfa-cc components.  Some components are installed in /some/directory/bin,
    30   others in /some/directory/lib.  If unspecified, this defaults to /usr/local.
    31   To use (a subdirectory of) your home directory, ${HOME}/some/dir works, but
    32   it is important not to put quotes around the directory path; Cforall may
    33   appear to build, but the installed version may not work properly.
     26  $ ./configure --help
     27
     28to list them.  The most common argument is:
     29
     30  --prefix=/some/directory controls the path prefix common to all installed
     31    cfa-cc components.  Components are installed in directories bin and lib.
     32    If unspecified, prefix defaults to /usr/local.  To use (a subdirectory of)
     33    your home directory, ${HOME}/some/dir, but do not put quotes around the
     34    directory path; Cforall may appear to build, but the installed version may
     35    not work properly.
    3436
    3537
  • tests/pybin/tools.py

    r2ac218d re75b753  
    376376                return 1, "ERR No core dump"
    377377
    378         return sh('gdb', '-n', path, core, '-batch', '-x', cmd, output_file=subprocess.PIPE)
     378        try:
     379                return sh('gdb', '-n', path, core, '-batch', '-x', cmd, output_file=subprocess.PIPE)
     380        except:
     381                return 1, "ERR Could not read core with gdb"
    379382
    380383def core_archive(dst, name, exe):
Note: See TracChangeset for help on using the changeset viewer.