Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
SWIFTsim
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SWIFT
SWIFTsim
Commits
c000b124
Commit
c000b124
authored
6 months ago
by
Darwin
Committed by
Matthieu Schaller
6 months ago
Browse files
Options
Downloads
Patches
Plain Diff
Improve ./configure script to fix macOS function detection issues
parent
fa5d752f
Branches
Branches containing commit
Tags
Tags containing commit
3 merge requests
!2180
Mhd canvas into MHD_FS
,
!2165
Merge master
,
!2102
Improve ./configure script to fix macOS function detection issues
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
configure.ac
+12
-6
12 additions, 6 deletions
configure.ac
src/feedback/GEAR/initial_mass_function.c
+1
-0
1 addition, 0 deletions
src/feedback/GEAR/initial_mass_function.c
src/feedback/GEAR/stellar_evolution.c
+1
-0
1 addition, 0 deletions
src/feedback/GEAR/stellar_evolution.c
with
14 additions
and
6 deletions
configure.ac
+
12
−
6
View file @
c000b124
...
@@ -1839,14 +1839,12 @@ if test "$have_armv7apmccntr"x = "yes"x; then
...
@@ -1839,14 +1839,12 @@ if test "$have_armv7apmccntr"x = "yes"x; then
fi
fi
# Check if we have native exp10 and exp10f functions. If not fallback to our
# Check if we have native exp10 and exp10f functions. If not fallback to our
# implementations. On Apple/CLANG we have __exp10, so also check for that
# implementations. On Apple/CLANG
/Homebrew gcc
we have __exp10, so also check for that
# if the compiler is clang.
# if the compiler is clang.
AC_CHECK_LIB([m],[exp10], [AC_DEFINE([HAVE_EXP10],1,[The exp10 function is present.])])
AC_CHECK_LIB([m],[exp10], [AC_DEFINE([HAVE_EXP10],1,[The exp10 function is present.])])
AC_CHECK_LIB([m],[exp10f], [AC_DEFINE([HAVE_EXP10F],1,[The exp10f function is present.])])
AC_CHECK_LIB([m],[exp10f], [AC_DEFINE([HAVE_EXP10F],1,[The exp10f function is present.])])
if test "$ax_cv_c_compiler_vendor" = "clang"; then
AC_CHECK_LIB([m],[__exp10], [AC_DEFINE([HAVE___EXP10],1,[The __exp10 function is present.])])
AC_CHECK_LIB([m],[__exp10], [AC_DEFINE([HAVE___EXP10],1,[The __exp10 function is present.])])
AC_CHECK_LIB([m],[__exp10f], [AC_DEFINE([HAVE___EXP10F],1,[The __exp10f function is present.])])
AC_CHECK_LIB([m],[__exp10f], [AC_DEFINE([HAVE___EXP10F],1,[The __exp10f function is present.])])
fi
# Check if we have native sincos and sincosf functions. If not fallback to our
# Check if we have native sincos and sincosf functions. If not fallback to our
# implementations. On Apple/CLANG we have __sincos, so also check for that
# implementations. On Apple/CLANG we have __sincos, so also check for that
...
@@ -1858,6 +1856,14 @@ if test "$ax_cv_c_compiler_vendor" = "clang"; then
...
@@ -1858,6 +1856,14 @@ if test "$ax_cv_c_compiler_vendor" = "clang"; then
AC_CHECK_LIB([m],[__sincosf], [AC_DEFINE([HAVE___SINCOSF],1,[The __sincosf function is present.])])
AC_CHECK_LIB([m],[__sincosf], [AC_DEFINE([HAVE___SINCOSF],1,[The __sincosf function is present.])])
fi
fi
# On Apple (CLANG or Homebrew gcc), check for __sincos and __sincosf inline functions in the headers.
AC_CHECK_HEADERS([math.h], [
AC_CHECK_DECLS([__sincos, __sincosf], [
AC_DEFINE([HAVE___SINCOS], 1, [The __sincos function is present.])
AC_DEFINE([HAVE___SINCOSF], 1, [The __sincosf function is present.])
], [], [#include <math.h>])
])
# The aocc compiler has optimized maths libraries that we should use. Check
# The aocc compiler has optimized maths libraries that we should use. Check
# any clang for this support. Note do this after the basic check for maths
# any clang for this support. Note do this after the basic check for maths
# as we need to make sure -lm follows. Also note needs -Ofast or -ffast-math
# as we need to make sure -lm follows. Also note needs -Ofast or -ffast-math
...
...
This diff is collapsed.
Click to expand it.
src/feedback/GEAR/initial_mass_function.c
+
1
−
0
View file @
c000b124
...
@@ -19,6 +19,7 @@
...
@@ -19,6 +19,7 @@
/* local headers */
/* local headers */
#include
"initial_mass_function.h"
#include
"initial_mass_function.h"
#include
"exp10.h"
#include
"hdf5_functions.h"
#include
"hdf5_functions.h"
#include
"stellar_evolution_struct.h"
#include
"stellar_evolution_struct.h"
...
...
This diff is collapsed.
Click to expand it.
src/feedback/GEAR/stellar_evolution.c
+
1
−
0
View file @
c000b124
...
@@ -28,6 +28,7 @@
...
@@ -28,6 +28,7 @@
#include
"stellar_evolution_struct.h"
#include
"stellar_evolution_struct.h"
#include
"supernovae_ia.h"
#include
"supernovae_ia.h"
#include
"supernovae_ii.h"
#include
"supernovae_ii.h"
#include
"exp10.h"
#include
<math.h>
#include
<math.h>
#include
<stddef.h>
#include
<stddef.h>
...
...
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
sign in
to comment