diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | codecs/lpc10/Makefile | 34 | ||||
| -rw-r--r-- | main/Makefile | 2 |
3 files changed, 22 insertions, 17 deletions
@@ -15,6 +15,7 @@ # # ASTCFLAGS - compiler options # ASTLDFLAGS - linker flags (not libraries) +# AST_LIBS - libraries to build binaries XXX # LIBS - additional libraries, at top-level for all links, # on a single object just for that object # SOLINK - linker flags used only for creating shared objects (.so files), @@ -302,7 +303,7 @@ $(SUBDIRS): depend makeopts.embed_rules main: $(filter-out main,$(MOD_SUBDIRS)) $(MOD_SUBDIRS): - @ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(MAKE) --no-print-directory -C $@ SUBDIR=$@ all + @ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" AST_LIBS="$(AST_LIBS)" $(MAKE) --no-print-directory -C $@ SUBDIR=$@ all $(OTHER_SUBDIRS): @ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(MAKE) --no-print-directory -C $@ SUBDIR=$@ all diff --git a/codecs/lpc10/Makefile b/codecs/lpc10/Makefile index 18b7c0bcc..5594bb86b 100644 --- a/codecs/lpc10/Makefile +++ b/codecs/lpc10/Makefile @@ -23,30 +23,34 @@ LIB_TARGET_DIR = . CFLAGS+= -fPIC -Wno-comment +# The code here generates lots of warnings, so compiling with -Werror +# fails miserably. Remove it for the time being. +ASTCFLAGS:= $(ASTCFLAGS:-Werror=) + #fix for PPC processors and ALPHA, And UltraSparc too ifneq ($(OSARCH),Darwin) -ifneq ($(findstring BSD,${OSARCH}),BSD) -ifneq ($(PROC),ppc) -ifneq ($(PROC),x86_64) -ifneq ($(PROC),alpha) + ifneq ($(findstring BSD,${OSARCH}),BSD) + ifneq ($(PROC),ppc) + ifneq ($(PROC),x86_64) + ifneq ($(PROC),alpha) #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only. #This works for even old (2.96) versions of gcc and provides a small boost either way. #A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn.t support it. #So we go lowest common available by gcc and go a step down, still a step up from #the default as we now have a better instruction set to work with. - Belgarath -ifeq ($(PROC),ultrasparc) + ifeq ($(PROC),ultrasparc) CFLAGS+= -mtune=$(PROC) -mcpu=v8 -O3 -fomit-frame-pointer -else -ifneq ($(OSARCH),SunOS) -ifneq ($(OSARCH),arm) + else + ifneq ($(OSARCH),SunOS) + ifneq ($(OSARCH),arm) # CFLAGS+= -march=$(PROC) -endif -endif -endif -endif -endif -endif -endif + endif + endif + endif + endif + endif + endif + endif endif LIB = $(LIB_TARGET_DIR)/liblpc10.a diff --git a/main/Makefile b/main/Makefile index 2aa8ef8a7..a400ebd30 100644 --- a/main/Makefile +++ b/main/Makefile @@ -90,7 +90,7 @@ ifeq ($(OSARCH),SunOS) endif editline/libedit.a: - cd editline && test -f config.h || CFLAGS="$(ASTCFLAGS)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) + cd editline && test -f config.h || CFLAGS="$(ASTCFLAGS:-Werror=)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) $(MAKE) -C editline libedit.a db1-ast/libdb1.a: |