diff options
| author | Thomas Zander <thomas.e.zander@googlemail.com> | 2015-10-11 17:56:13 +0200 |
|---|---|---|
| committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2015-10-12 08:15:18 +1100 |
| commit | d20a79a8bdbfccb9267a7bd43791084430b49fd0 (patch) | |
| tree | 9cf4519754571ca95f0891062376f293c605b143 /build | |
| parent | c671e1c91ad3a9a7b40500122e278cc03e6e1daa (diff) | |
| download | flac-d20a79a8bdbfccb9267a7bd43791084430b49fd0.tar.gz | |
Let Makefile.lite build succeed on FreeBSD amd64
- build/config.mk: some OS call x86_64 amd64
- build/config.mk: FreeBSD needs -DHAVE_SYS_PARAM_H in CFLAGS
- build/exe.mk and lib.mk: default compilers on FreeBSD are cc/c++
- src/libFLAC++/Makefile.lite: $(OS) is not defined
- src/libFLAC++/Makefile.lite: Link -lstdc++ on FreeBSD
Signed-off-by: Erik de Castro Lopo <erikd@mega-nerd.com>
Diffstat (limited to 'build')
| -rw-r--r-- | build/config.mk | 9 | ||||
| -rw-r--r-- | build/exe.mk | 5 | ||||
| -rw-r--r-- | build/lib.mk | 5 |
3 files changed, 18 insertions, 1 deletions
diff --git a/build/config.mk b/build/config.mk index a889578a..0476ddc5 100644 --- a/build/config.mk +++ b/build/config.mk @@ -53,7 +53,11 @@ ifndef PROC F_PIC := endif else - PROC := $(shell uname -p) + ifeq ($(shell uname -p),amd64) + PROC := x86_64 + else + PROC := $(shell uname -p) + endif endif endif ifeq ($(PROC),powerpc) @@ -105,6 +109,9 @@ ifeq ($(OS),Linux) CONFIG_CFLAGS += -fPIC endif endif +ifeq ($(OS),FreeBSD) + CONFIG_CFLAGS += -DHAVE_SYS_PARAM_H +endif ifneq (0,$(USE_ICONV)) CONFIG_CFLAGS += -DHAVE_ICONV diff --git a/build/exe.mk b/build/exe.mk index 6bf149e3..2d16cb66 100644 --- a/build/exe.mk +++ b/build/exe.mk @@ -26,9 +26,14 @@ ifeq ($(OS),Darwin) CC = cc CCC = c++ else +ifeq ($(OS),FreeBSD) + CC = cc + CCC = c++ +else CC = gcc CCC = g++ endif +endif NASM = nasm LINK = $(CC) $(LINKAGE) OBJPATH = $(topdir)/objs diff --git a/build/lib.mk b/build/lib.mk index 28e0d5ca..09191089 100644 --- a/build/lib.mk +++ b/build/lib.mk @@ -26,9 +26,14 @@ ifeq ($(OS),Darwin) CC = cc CCC = c++ else +ifeq ($(OS),FreeBSD) + CC = cc + CCC = c++ +else CC = gcc CCC = g++ endif +endif NASM = nasm LINK = ar cru OBJPATH = $(topdir)/objs |