Skip to content

Commit

Permalink
update inc/nginx_configure.inc disable Clang if NGINX_PASSENGER=y ena…
Browse files Browse the repository at this point in the history
…bled

Clang fails to compile Passenger Nginx Module while GCC compiler works
  • Loading branch information
centminmod committed Jun 12, 2015
1 parent 4c3b401 commit 66d8d0a
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions inc/nginx_configure.inc
Expand Up @@ -280,6 +280,12 @@ else
RUBYMODULE=""
fi

# disable Clang compiler for Nginx if NGINX_PASSENGER=y as Clang fails
# to compile Passenger Nginx Module while GCC compiler works
if [[ "$NGINX_PASSENGER" = [yY] ]]; then
CLANG='n'
fi

if [[ -d "${DIR_TMP}/nginx-${NGINX_VERSION}" && ! "$ngver" ]]; then
cd ${DIR_TMP}/nginx-${NGINX_VERSION}
fi
Expand Down Expand Up @@ -348,10 +354,10 @@ if [[ "$CLANG" = [yY] ]]; then
if [[ ! -f /usr/bin/clang ]]; then
yum -q -y install clang clang-devel
fi
export CC="ccache /usr/bin/clang"
export CXX="ccache /usr/bin/clang++"
export CC="ccache /usr/bin/clang -ferror-limit=0"
export CXX="ccache /usr/bin/clang++ -ferror-limit=0"
export CCACHE_CPP2=yes
CLANG_CCOPT=' -Wno-deprecated-declarations -Wno-unused-parameter -Wno-unused-const-variable -Wno-conditional-uninitialized -Wno-mismatched-tags -Wno-c++11-extensions -Wno-sometimes-uninitialized -Wno-parentheses-equality -Wno-tautological-compare -Wno-self-assign'
CLANG_CCOPT=' -Wno-deprecated-declarations -Wno-unused-parameter -Wno-unused-const-variable -Wno-conditional-uninitialized -Wno-mismatched-tags -Wno-c++11-extensions -Wno-sometimes-uninitialized -Wno-parentheses-equality -Wno-tautological-compare -Wno-self-assign -Wno-deprecated-register -Wno-deprecated'
else
CLANG_CCOPT=""
fi
Expand Down

0 comments on commit 66d8d0a

Please sign in to comment.