Legacy Makefiles: Don't force C++14 with GCC 4.8: round 2.

Bug 3043659 Bug 200618218 Reviewed-by: Allison Vacanti <[email protected]>
alliepiper · Jul 14, 2020 · 0c81f42 · 0c81f42
1 parent 80c0c37
commit 0c81f42
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 30 deletions.
diff --git a/Makefile b/Makefile
@@ -111,35 +111,6 @@ else
   include ../build/common.mk
 endif
 
-# Print host compiler version.
-
-VERSION_FLAG :=
-ifeq ($(OS),$(filter $(OS),Linux Darwin))
-  ifdef USEPGCXX        # PGI
-    VERSION_FLAG := -V
-  else
-    ifdef USEXLC        # XLC
-      VERSION_FLAG := -qversion
-    else                # GCC, ICC or Clang AKA the sane ones.
-      VERSION_FLAG := --version
-    endif
-  endif
-else ifeq ($(OS),win32) # MSVC
-  # cl.exe run without any options will print its version info and exit.
-  VERSION_FLAG :=
-endif
-
-CCBIN_ENVIRONMENT :=
-ifeq ($(OS), QNX)
-  # QNX's GCC complains if QNX_HOST and QNX_TARGET aren't defined in the
-  # environment.
-  CCBIN_ENVIRONMENT := QNX_HOST=$(QNX_HOST) QNX_TARGET=$(QNX_TARGET)
-endif
-
-$(info #### CCBIN         : $(CCBIN))
-$(info #### CCBIN VERSION : $(shell $(CCBIN_ENVIRONMENT) $(CCBIN) $(VERSION_FLAG)))
-$(info #### CXX_STD       : $(CXX_STD))
-
 ifeq ($(OS), win32)
   CREATE_DVS_PACKAGE = $(ZIP) -r built/CUDA-thrust-package.zip bin thrust/internal/test thrust/internal/scripts thrust/internal/benchmark thrust/*.trs $(DVS_COMMON_TEST_PACKAGE_FILES)
   APPEND_H_DVS_PACKAGE = $(ZIP) -rg built/CUDA-thrust-package.zip thrust -9 -i *.h

diff --git a/internal/build/common_compiler.mk b/internal/build/common_compiler.mk
@@ -130,3 +130,31 @@ CUDACC_FLAGS += -Werror all-warnings
 
 # Print warning numbers with cudafe diagnostics
 CUDACC_FLAGS += -Xcudafe --display_error_number
+
+VERSION_FLAG :=
+ifeq ($(OS),$(filter $(OS),Linux Darwin))
+  ifdef USEPGCXX        # PGI
+    VERSION_FLAG := -V
+  else
+    ifdef USEXLC        # XLC
+      VERSION_FLAG := -qversion
+    else                # GCC, ICC or Clang AKA the sane ones.
+      VERSION_FLAG := --version
+    endif
+  endif
+else ifeq ($(OS),win32) # MSVC
+  # cl.exe run without any options will print its version info and exit.
+  VERSION_FLAG :=
+endif
+
+CCBIN_ENVIRONMENT :=
+ifeq ($(OS), QNX)
+  # QNX's GCC complains if QNX_HOST and QNX_TARGET aren't defined in the
+  # environment.
+  CCBIN_ENVIRONMENT := QNX_HOST=$(QNX_HOST) QNX_TARGET=$(QNX_TARGET)
+endif
+
+$(info #### CCBIN         : $(CCBIN))
+$(info #### CCBIN VERSION : $(shell $(CCBIN_ENVIRONMENT) $(CCBIN) $(VERSION_FLAG)))
+$(info #### CXX_STD       : $(CXX_STD))
+
diff --git a/internal/build/common_detect.mk b/internal/build/common_detect.mk
@@ -1,4 +1,4 @@
-CXX_STD = c++14
+CXX_STD = c++11
 
 ifeq ($(THRUST_TEST),1)
   include $(ROOTDIR)/build/getprofile.mk