diff options
| author | Bryce Adelstein Lelbach aka wash <brycelelbach@gmail.com> | 2020-07-13 22:41:29 +0300 |
|---|---|---|
| committer | Bryce Adelstein Lelbach aka wash <brycelelbach@gmail.com> | 2020-07-14 21:10:52 +0300 |
| commit | 0c81f42b296f0ead7e42055d7929a6dd695bc197 (patch) | |
| tree | cfaf30af8aea52c78a6dad431588f342bcf2e618 /Makefile | |
| parent | 80c0c37d0d54c013dc4c0fbc9bd3e0f9e31b3475 (diff) | |
Legacy Makefiles: Don't force C++14 with GCC 4.8: round 2.
Bug 3043659
Bug 200618218
Reviewed-by: Allison Vacanti <alliepiper16@gmail.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 29 |
1 files changed, 0 insertions, 29 deletions
@@ -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 |