diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2019-08-06 16:46:41 -0500 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2019-08-06 16:46:41 -0500 |
| commit | 3ed8e46782aec83991aa8dbe4936ab36beca2501 (patch) | |
| tree | f2dad01c2d872dc1b55649a577fbb35b2d9b9040 | |
| parent | 3db019786506492bd217ebf37aa1ab9261c8808e (diff) | |
| download | infinitytier-3ed8e46782aec83991aa8dbe4936ab36beca2501.tar.gz infinitytier-3ed8e46782aec83991aa8dbe4936ab36beca2501.zip | |
Use devtoolset-8 on RHEL/CentOS 7
| -rw-r--r-- | make-linux.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/make-linux.mk b/make-linux.mk index b81c7aeb..db386306 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -1,12 +1,12 @@ # Automagically pick clang or gcc, with preference for clang # This is only done if we have not overridden these with an environment or CLI variable ifeq ($(origin CC),default) - CC:=$(shell if [ -e /usr/bin/clang ]; then echo clang; else echo gcc; fi) - CC:=$(shell if [ -e /opt/intel/bin/icc ]; then echo /opt/intel/bin/icc -ipo -ansi-alias; else echo $(CC); fi) + CC:=$(shell if [ -e /usr/bin/clang ]; then echo clang; else echo gcc; fi) + CC:=$(shell if [ -e /opt/rh/devtoolset-8/root/usr/bin/gcc ]; then echo /opt/rh/devtoolset-8/root/usr/bin/gcc; else echo $(CC); fi) endif ifeq ($(origin CXX),default) - CXX:=$(shell if [ -e /usr/bin/clang++ ]; then echo clang++; else echo g++; fi) - CXX:=$(shell if [ -e /opt/intel/bin/icc ]; then echo /opt/intel/bin/icc -ipo -ansi-alias; else echo $(CXX); fi) + CXX:=$(shell if [ -e /usr/bin/clang++ ]; then echo clang++; else echo g++; fi) + CXX:=$(shell if [ -e /opt/rh/devtoolset-8/root/usr/bin/g++ ]; then echo /opt/rh/devtoolset-8/root/usr/bin/g++; else echo $(CXX); fi) endif INCLUDES?= |