diff options
| author | rhaas <rhaas@091d3ff0-52bc-4db5-b7a6-18201e4c0cca> | 2014-01-13 17:17:05 +0000 |
|---|---|---|
| committer | rhaas <rhaas@091d3ff0-52bc-4db5-b7a6-18201e4c0cca> | 2014-01-13 17:17:05 +0000 |
| commit | caea1a7763917ce130415afe9eff29f4ece28fa9 (patch) | |
| tree | b9cf556ba8afef760b980f87b687fdb48cf33bd7 | |
| parent | f696e782c05a218e1399615e722c0a31e4448231 (diff) | |
support old Intel compilers in configure.sh
the configure script actively remove OpenMP flags from CFLAGS etc but only
searches for -fopenmp but not for -openmp as used by (older) intel compilers.
This commit patch changes the used regular expression to fix this.
git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/OpenSSL/trunk@54 091d3ff0-52bc-4db5-b7a6-18201e4c0cca
| -rw-r--r-- | configure.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.sh b/configure.sh index 9c0866f..c7f643d 100644 --- a/configure.sh +++ b/configure.sh @@ -120,9 +120,9 @@ then unset options # OpenSSL's 'config' script uses $options itself # OpenSSL doesn't want to link with -fopenmp (can't pass # LDFLAGS?), so instead we remove all OpenMP flags - export CPPFLAGS=$(echo '' $CPPFLAGS | sed -e 's/-fopenmp//') - export CFLAGS=$(echo '' $CFLAGS | sed -e 's/-fopenmp//') - export LDFLAGS=$(echo '' $LDFLAGS | sed -e 's/-fopenmp//') + export CPPFLAGS=$(echo '' $CPPFLAGS | sed -e 's/-f\?openmp//') + export CFLAGS=$(echo '' $CFLAGS | sed -e 's/-f\?openmp//') + export LDFLAGS=$(echo '' $LDFLAGS | sed -e 's/-f\?openmp//') # OpenSSL does not automatically build a 64bit version on 64bit Macs # setting KERNEL_BITS=64 tells it we want one if uname -v | grep >/dev/null '^Darwin.*RELEASE_X86_64' ; then |