Skip to content

Commit

Permalink
Merge pull request #118 from ax3l/fix-noDefaultComp
Browse files Browse the repository at this point in the history
COMP: No Default
  • Loading branch information
zingale authored Feb 1, 2022
2 parents e70e10c + 190c00a commit 4b290c5
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions docs/source/intro.rst
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ Using example-tests.ini as a template:
#. Configure the build settings if necessary. The ``sourceTree`` variable
determines the build system (C_Src => C++, AMReX =>
standalone AMReX tests), while ``COMP`` determines the
compilers. The ``numMakeJobs`` and ``add_to_c_make_command`` parameters
allow for some additional control over the make command.
compilers (e.g., ``g++``). The ``numMakeJobs`` and ``add_to_c_make_command``
parameters allow for some additional control over the make command.

#. Setting up the repositories:

Expand Down
5 changes: 3 additions & 2 deletions suite.py
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ def __init__(self, args):
self.MPIcommand = ""
self.MPIhost = ""

self.COMP = "g++"
self.COMP = "" # e.g., g++

self.ftools = ["fcompare", "fboxinfo", "fsnapshot"]
self.extra_tools = ""
Expand Down Expand Up @@ -1131,7 +1131,8 @@ def cmake_config( self, name, path, configOpts="", install = 0, env = None):
# Define enviroment
ENV = {}
ENV = dict(os.environ) # Copy of current enviroment
ENV['CXX'] = self.COMP
if self.COMP:
ENV['CXX'] = self.COMP

if env is not None: ENV.update(env)

Expand Down
2 changes: 1 addition & 1 deletion test_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
goUpLink = <1: add "Go UP" link at top of the web page >
COMP = < name of C/C++ compiler >
COMP = < name of C/C++ compiler, e.g., g++ >
add_to_c_make_command = < any additional defines to add to the make invocation for C_Src AMReX >
Expand Down

0 comments on commit 4b290c5

Please sign in to comment.