Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Spack
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
eic_tools
Spack
Commits
177b7f11
Commit
177b7f11
authored
6 years ago
by
Denis Davydov
Committed by
Gregory Lee
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
intel: optionally take gcc executable from cflags (#11136)
parent
6b097819
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
lib/spack/spack/build_systems/intel.py
+15
-3
15 additions, 3 deletions
lib/spack/spack/build_systems/intel.py
with
15 additions
and
3 deletions
lib/spack/spack/build_systems/intel.py
+
15
−
3
View file @
177b7f11
...
...
@@ -682,6 +682,19 @@ def openmp_libs(self):
debug_print
(
omp_libs
)
return
omp_libs
@property
def
_gcc_executable
(
self
):
'''
Return GCC executable
'''
# Match the available gcc, as it's done in tbbvars.sh.
gcc_name
=
'
gcc
'
# but first check if -gcc-name is specified in cflags
for
flag
in
self
.
spec
.
compiler_flags
[
'
cflags
'
]:
if
flag
.
startswith
(
'
-gcc-name=
'
):
gcc_name
=
flag
.
split
(
'
-gcc-name=
'
)[
1
]
break
debug_print
(
gcc_name
)
return
Executable
(
gcc_name
)
@property
def
tbb_libs
(
self
):
'''
Supply LibraryList for linking TBB
'''
...
...
@@ -693,7 +706,7 @@ def tbb_libs(self):
# option: "icpc -tbb"
# TODO: clang(?)
gcc
=
E
xecutable
(
'
gcc
'
)
# must be gcc, not self.compiler.cc
gcc
=
self
.
_gcc_e
xecutable
# must be gcc, not self.compiler.cc
cxx_lib_path
=
gcc
(
'
--print-file-name
'
,
'
libstdc++.%s
'
%
dso_suffix
,
output
=
str
)
...
...
@@ -704,8 +717,7 @@ def tbb_libs(self):
@property
def
_tbb_abi
(
self
):
'''
Select the ABI needed for linking TBB
'''
# Match the available gcc, as it's done in tbbvars.sh.
gcc
=
Executable
(
'
gcc
'
)
gcc
=
self
.
_gcc_executable
matches
=
re
.
search
(
r
'
(gcc|LLVM).* ([0-9]+\.[0-9]+\.[0-9]+).*
'
,
gcc
(
'
--version
'
,
output
=
str
),
re
.
I
|
re
.
M
)
abi
=
''
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment