diff options
| author | Jared Van Bortel <jared@nomic.ai> | 2024-02-18 16:21:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-18 16:21:52 -0500 |
| commit | a0c2dad9d43456c677e205c6240a5f8afb0121ac (patch) | |
| tree | aede20b4bf422b9d4be12114f2e57120f698b6fa /scripts | |
| parent | 14278f55d2e2c6a53022075c7f2719b71e1cd61d (diff) | |
build : pass all warning flags to nvcc via -Xcompiler (#5570)
* build : pass all warning flags to nvcc via -Xcompiler
* make : fix apparent mis-merge from #3952
* make : fix incorrect GF_CC_VER for CUDA host compiler
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/get-flags.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/get-flags.mk b/scripts/get-flags.mk index 596d7ead..a742766d 100644 --- a/scripts/get-flags.mk +++ b/scripts/get-flags.mk @@ -1,6 +1,6 @@ ifeq '' '$(findstring clang,$(shell $(GF_CC) --version))' GF_CC_IS_GCC = 1 - GF_CC_VER := $(shell { $(GF_CC) -dumpfullversion 2>/dev/null || $(GF_CC) -dumpversion; } | awk -F. '{ printf("%02d%02d%02d", $$1, $$2, $$3) }') + GF_CC_VER := $(shell { $(GF_CC) -dumpfullversion 2>/dev/null; echo; $(GF_CC) -dumpversion; } | awk -F. '/./ { printf("%02d%02d%02d", $$1, $$2, $$3); exit }') else GF_CC_IS_CLANG = 1 ifeq '' '$(findstring Apple,$(shell $(GF_CC) --version))' |