Skip to content

Commit 190c00a

Browse files
committed
COMP: No Default
If we set a default to COMP, we cannot overwrite it with environment variables. Since the examples and docs document this well, we can default to no compiler and leave all the config to an environment/package manager. This reduces surprises when using the regression tests.
1 parent e70e10c commit 190c00a

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

docs/source/intro.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ Using example-tests.ini as a template:
8484
#. Configure the build settings if necessary. The ``sourceTree`` variable
8585
determines the build system (C_Src => C++, AMReX =>
8686
standalone AMReX tests), while ``COMP`` determines the
87-
compilers. The ``numMakeJobs`` and ``add_to_c_make_command`` parameters
88-
allow for some additional control over the make command.
87+
compilers (e.g., ``g++``). The ``numMakeJobs`` and ``add_to_c_make_command``
88+
parameters allow for some additional control over the make command.
8989

9090
#. Setting up the repositories:
9191

suite.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ def __init__(self, args):
424424
self.MPIcommand = ""
425425
self.MPIhost = ""
426426

427-
self.COMP = "g++"
427+
self.COMP = "" # e.g., g++
428428

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

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

test_util.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
3737
goUpLink = <1: add "Go UP" link at top of the web page >
3838
39-
COMP = < name of C/C++ compiler >
39+
COMP = < name of C/C++ compiler, e.g., g++ >
4040
4141
add_to_c_make_command = < any additional defines to add to the make invocation for C_Src AMReX >
4242

0 commit comments

Comments
 (0)