diff options
| author | Alexander Pyhalov <apyhalov@gmail.com> | 2018-10-05 09:22:14 +0300 |
|---|---|---|
| committer | Alexander Pyhalov <apyhalov@gmail.com> | 2018-10-05 16:56:36 +0300 |
| commit | e21a8450bf5315e6723291e399ddc335ccf05375 (patch) | |
| tree | 8e8230a61f81d67a501fac5bee2ea7878af31c04 /usr/src/Makefile | |
| parent | a5522c0de40b6dc96929664af4b5ab3876ca8e1d (diff) | |
| download | illumos-gfx-drm-e21a8450bf5315e6723291e399ddc335ccf05375.tar.gz | |
9869 gfx-drm build is broken after recent cw changes
Reviewed by: John Levon <john.levon@joyent.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Diffstat (limited to 'usr/src/Makefile')
| -rw-r--r-- | usr/src/Makefile | 36 |
1 files changed, 2 insertions, 34 deletions
diff --git a/usr/src/Makefile b/usr/src/Makefile index f833888..caa40e8 100644 --- a/usr/src/Makefile +++ b/usr/src/Makefile @@ -188,42 +188,10 @@ FRC: # cc-version: - @if $($(MACH)_CC) -_versions >/dev/null 2>/dev/null; then \ - $(ECHO) 32-bit compiler; \ - $(ECHO) $($(MACH)_CC); \ - $($(MACH)_CC) -_versions 2>&1 | \ - $(EGREP) '^(cw|cc|gcc|primary|shadow)'; \ - else \ - __COMPILER=`$($(MACH)_CC) -_compiler 2>/dev/null || $(TRUE)`;\ - if [ -z "$$__COMPILER" ]; then \ - $(ECHO) No 32-bit compiler found; \ - exit 1; \ - else \ - $(ECHO) 32-bit compiler; \ - $(ECHO) $($(MACH)_CC); \ - $(ECHO) $$__COMPILER; \ - $($(MACH)_CC) -V 2>&1 | head -1; \ - fi; \ - fi + @$(CW) --versions $(CW_CC_COMPILERS) 2>&1 +# for older nightlies cc64-version: - @if $($(MACH64)_CC) -_versions >/dev/null 2>/dev/null; then \ - $(ECHO) 64-bit compiler; \ - $(ECHO) $($(MACH64)_CC); \ - $($(MACH64)_CC) -_versions 2>&1 | \ - $(EGREP) '^(cw|cc|gcc|primary|shadow)'; \ - else \ - __COMPILER=`$($(MACH64)_CC) -_compiler 2>/dev/null || $(TRUE)`;\ - if [ -z "$$__COMPILER" ]; then \ - $(ECHO) No 64-bit compiler found; \ - exit 1; \ - else \ - $(ECHO) 64-bit compiler; \ - $(ECHO) $($(MACH64)_CC); \ - $(ECHO) $$__COMPILER; \ - $($(MACH64)_CC) -V 2>&1 | head -1; \ - fi; \ - fi java-version: @if [ -x "$(JAVAC)" ]; then \ |