diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:04:11 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:04:11 -0800 |
| commit | 4c5a5fb53bccceff331bae70f748bf9b4609fe0a (patch) | |
| tree | d6ae69d0d3f4a4d760a3254ec326bca4a8afacfe /mk | |
| parent | e95877ecfa1170d77b1ec1f66752725cdda01b64 (diff) | |
| download | external_dhcpcd-4c5a5fb53bccceff331bae70f748bf9b4609fe0a.zip external_dhcpcd-4c5a5fb53bccceff331bae70f748bf9b4609fe0a.tar.gz external_dhcpcd-4c5a5fb53bccceff331bae70f748bf9b4609fe0a.tar.bz2 | |
Code drop from //branches/cupcake/...@124589
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/os-Darwin.mk | 5 | ||||
| -rw-r--r-- | mk/os-Linux.mk | 20 | ||||
| -rw-r--r-- | mk/os.mk | 2 | ||||
| -rw-r--r-- | mk/prog.mk | 11 |
4 files changed, 12 insertions, 26 deletions
diff --git a/mk/os-Darwin.mk b/mk/os-Darwin.mk new file mode 100644 index 0000000..f2c3104 --- /dev/null +++ b/mk/os-Darwin.mk @@ -0,0 +1,5 @@ +# Setup OS specific variables +# Copyright 2008 Roy Marples <roy@marples.name> + +include ${MK}/os-BSD.mk +LINK_RPATH= --rpath diff --git a/mk/os-Linux.mk b/mk/os-Linux.mk index 16f0f60..2d316b1 100644 --- a/mk/os-Linux.mk +++ b/mk/os-Linux.mk @@ -6,23 +6,3 @@ SRC_IF= if-linux.c CPPFLAGS+= -D_BSD_SOURCE -D_XOPEN_SOURCE=600 LIBRT= -lrt - -# Work out if our fork() works or not. -# If cross-compiling, you'll need to set HAVE_FORK to yes or no depending -# on your target arch. -_HAVE_FORK_SH= if test "${HAVE_FORK}" = "yes"; then \ - echo ""; \ - elif test -n "${HAVE_FORK}"; then \ - echo "-DTHERE_IS_NO_FORK"; \ - else \ - printf '\#include <stdlib.h>\n\#include <unistd.h>\nint main (void) { pid_t pid = fork(); if (pid == -1) exit (-1); exit (0); }\n' > .fork.c; \ - ${CC} .fork.c -o .fork >/dev/null 2>&1; \ - if ./.fork; then \ - echo ""; \ - else \ - echo "-DTHERE_IS_NO_FORK"; \ - fi; \ - rm -f .fork.c .fork; \ - fi; -_HAVE_FORK!= ${_HAVE_FORK_SH} -CPPFLAGS+= ${_HAVE_FORK}$(shell ${_HAVE_FORK_SH}) @@ -1,7 +1,7 @@ # Setup OS specific variables # Copyright 2008 Roy Marples <roy@marples.name> -_OS_SH= case `uname -s` in Linux) echo "Linux";; *) echo "BSD";; esac +_OS_SH= case `uname -s` in Linux) echo "Linux";; Darwin) echo "Darwin";; *) echo "BSD";; esac _OS!= ${_OS_SH} OS= ${_OS}$(shell ${_OS_SH}) include ${MK}/os-${OS}.mk @@ -7,18 +7,19 @@ include ${MK}/cc.mk OBJS+= ${SRCS:.c=.o} -# This is for NetBSD which has a different libc in /lib which we need -# to link to if installing in / +# If building for /, ensure we use the libc in / if different from +# the default one in /usr/lib +LINK_RPATH?= -Wl,-rpath _RPATH_SH= if test "${PREFIX}" = "" -o "${PREIX}" = "/"; then \ - echo "-Wl,-rpath=${PREFIX}/${LIBNAME}"; \ + echo "${LINK_RPATH}=${PREFIX}/${LIBNAME}"; \ else \ echo ""; \ fi _RPATH!= ${_RPATH_SH} LDFLAGS+= ${_RPATH}$(shell ${_RPATH_SH}) -# This is for NetBSD which has different dynamic linker in /lib which we need -# to use to if installing in / +# If building for /, ensure we use the linker in /libexec if different from +# the default one in /usr/libexec _DYNLINK_SH= if test "${PREFIX}" = "" -o "${PREFIX}" = "/" && test -e /libexec/ld.elf_so; then \ echo "-Wl,-dynamic-linker=/libexec/ld.elf_so"; \ else \ |