--- cdf35_0-dist/Makefile.orig	2013-09-09 18:31:16.000000000 +0200
+++ cdf35_0-dist/Makefile	2014-03-08 17:36:13.311830189 +0100
@@ -781,7 +781,7 @@
 	@cd $(TOOLSsrcDIR); $(MAKE) \
 "CURSES=$(AND.$(CURSES).$(CURSES_$(OS)_$(ENV)))" \
 "CCx=$(CC_$(OS)_$(ENV))" \
-"COPTIONS=$(COPTIONS_$(OS)_$(ENV))" \
+"COPTIONS=$(UCOPTIONS) $(COPTIONS_$(OS)_$(ENV))" \
 "COPTIONSld=$(COPTIONSld_$(OS)_$(ENV))" \
 "SYSLIBS=$(SYSLIBSexe_$(OS)_$(ENV))" \
 "CURSESLIB=$(CURSESLIB_$(OS)_$(ENV))" \
@@ -793,7 +793,7 @@
 "SHARED=$(AND.$(SHARED).$(SHARED_$(OS)))" \
 "FOPTIONS=$(FOPTIONS_$(OS)) $(FOPTIONS_$(OS)_$(ENV))" \
 "FOPTIONSld=$(FOPTIONSld_$(OS)) $(FOPTIONSld_$(OS)_$(ENV))" \
-"COPTIONS=$(COPTIONS_$(OS)_$(ENV))" \
+"COPTIONS=$(UCOPTIONS) $(COPTIONS_$(OS)_$(ENV))" \
 "COPTIONSld=$(COPTIONSld_$(OS)_$(ENV))" \
 "SYSLIBS=$(SYSLIBSexe_$(OS)_$(ENV))" \
 "SHAREDEXT=$(SHAREDEXT_$(OS))" \