diff options
| author | Raymond Danks <ray.danks@se-eng.com> | 2012-04-27 08:46:55 -0600 |
|---|---|---|
| committer | Marc Jones <marcj303@gmail.com> | 2012-04-29 18:27:30 +0200 |
| commit | a2937145799999fb482cff2d2faf4925f335005d (patch) | |
| tree | 4e258e4e1427750d992b71057fceaa0a9af6f8b4 | |
| parent | 61e7c289d45f0113925e9d59e7d0e415a049bd1d (diff) | |
nvramtool: Allow build under Cygwin
To build under Cygwin, nvramtool depends upon the package ioperm:
http://openwince.sourceforge.net/ioperm/
for sys/io.h and sys/perm.h. This change causes the nvramtool make to correctly include and link against these headers and libraries.
Change-Id: If6cd9d324de7bc19830e0018844f42761b28ddd3
Signed-off-by: Raymond Danks <ray.danks@se-eng.com>
Reviewed-on: http://review.coreboot.org/940
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
| -rw-r--r-- | util/nvramtool/Makefile | 4 | ||||
| -rw-r--r-- | util/nvramtool/Makefile.inc | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/util/nvramtool/Makefile b/util/nvramtool/Makefile index 2a143b7b47..063bb1acd6 100644 --- a/util/nvramtool/Makefile +++ b/util/nvramtool/Makefile @@ -42,6 +42,10 @@ endif ifeq ($(OS_ARCH), NetBSD) LDFLAGS = -l$(shell uname -p) endif +ifeq ($(shell uname -o), Cygwin) +LDFLAGS = -lioperm +CFLAGS += -D__GLIBC__ +endif all: dep $(PROGRAM) diff --git a/util/nvramtool/Makefile.inc b/util/nvramtool/Makefile.inc index a70896c93b..b356720e2d 100644 --- a/util/nvramtool/Makefile.inc +++ b/util/nvramtool/Makefile.inc @@ -25,7 +25,12 @@ ifeq ($(OS_ARCH), Darwin) NVRAMTOOLFLAGS += -framework DirectHW endif ifeq ($(OS_ARCH), NetBSD) -NVRAMTOOLFLAGS += -l$(shell uname -p) +NVRAMTOOLLDLFLAGS = -l$(shell uname -p) +endif +ifeq ($(shell uname -o), Cygwin) +NVRAMTOOLFLAGS += -O2 -g -Wall -W -D__GLIBC__ +NVRAMTOOLLDFLAGS = -lioperm +HOSTCFLAGS = endif nvramtoolobj := @@ -43,6 +48,6 @@ $(objutil)/nvramtool/%.o: $(top)/util/nvramtool/%.c $(objutil)/nvramtool/nvramtool: $(objutil)/nvramtool $(objutil)/nvramtool/accessors $(objutil)/nvramtool/cli $(addprefix $(objutil)/nvramtool/,$(nvramtoolobj)) printf " HOSTCC $(subst $(objutil)/,,$(@)) (link)\n" - $(HOSTCC) $(NVRAMTOOLFLAGS) -o $@ $(addprefix $(objutil)/nvramtool/,$(nvramtoolobj)) + $(HOSTCC) $(NVRAMTOOLFLAGS) -o $@ $(addprefix $(objutil)/nvramtool/,$(nvramtoolobj)) $(NVRAMTOOLLDFLAGS) |