diff options
author | Andreas Baumann <abaumann@yahoo.com> | 2009-02-28 14:32:38 +0100 |
---|---|---|
committer | Andreas Baumann <abaumann@yahoo.com> | 2009-02-28 14:32:38 +0100 |
commit | fc2bfb1089218b8d1e57d331a447af92ab44f8a0 (patch) | |
tree | 40ea38c48901c0e433587854c764b0c343ca97f6 /makefiles | |
parent | 171bbff2c6532a6df566621c2d27ef2eb6161be0 (diff) | |
download | wolfbones-fc2bfb1089218b8d1e57d331a447af92ab44f8a0.tar.gz wolfbones-fc2bfb1089218b8d1e57d331a447af92ab44f8a0.tar.bz2 |
localtime_r and pthreads work on cygwin
Diffstat (limited to 'makefiles')
-rw-r--r-- | makefiles/gmake/compiler.mk | 5 | ||||
-rwxr-xr-x | makefiles/gmake/guess_env | 30 |
2 files changed, 23 insertions, 12 deletions
diff --git a/makefiles/gmake/compiler.mk b/makefiles/gmake/compiler.mk index f6bb802..623c6a2 100644 --- a/makefiles/gmake/compiler.mk +++ b/makefiles/gmake/compiler.mk @@ -220,6 +220,11 @@ PTHREADS_CFLAGS = -D_REENTRANT -pthread PTHREADS_LDFLAGS = -pthread PTHREADS_LIBS = endif +ifeq "$(PLATFORM)" "CYGWIN" +PTHREADS_CFLAGS = +PTHREADS_LDFLAGS = +PTHREADS_LIBS = +endif endif CFLAGS = $(COMPILE_FLAGS) $(PLATFORM_COMPILE_FLAGS) $(INCLUDE_DIRS) $(PTHREADS_CFLAGS) diff --git a/makefiles/gmake/guess_env b/makefiles/gmake/guess_env index d0a31ae..3e87828 100755 --- a/makefiles/gmake/guess_env +++ b/makefiles/gmake/guess_env @@ -2,6 +2,10 @@ # operating system and major, minor version, more should not be necessary +if test -r "$HOME/guess_env.inc"; then + . "$HOME/guess_env.inc" +else + UNAME_SYSTEM=`(uname -s) 2>/dev/null` UNAME_RELEASE=`(uname -r) 2>/dev/null` UNAME_VERSION=`(uname -v) 2>/dev/null` @@ -117,6 +121,8 @@ if test $COMPILER = 'spro'; then SPRO_MAJOR_VERSION=`echo $SPRO_VERSION | cut -d : -f 1` fi +fi + case "$1" in --platform) echo $PLATFORM ;; @@ -156,18 +162,18 @@ case "$1" in --all) cat <<EOF -ARCH = $ARCH -PLATFORM = $PLATFORM -OS_MAJOR_VERSION = $OS_MAJOR_VERSION -OS_MINOR_VERSION = $OS_MINOR_VERSION -COMPILER = $COMPILER -GCC_MAJOR_VERSION = $GCC_MAJOR_VERSION -GCC_MINOR_VERSION = $GCC_MINOR_VERSION -TCC_MAJOR_VERSION = $TCC_MAJOR_VERSION -TCC_MINOR_VERSION = $TCC_MINOR_VERSION -ICC_MAJOR_VERSION = $ICC_MAJOR_VERSION -ICC_MINOR_VERSION = $ICC_MINOR_VERSION -SPRO_MAJOR_VERSION = $SPRO_MAJOR_VERSION +ARCH=$ARCH +PLATFORM=$PLATFORM +OS_MAJOR_VERSION=$OS_MAJOR_VERSION +OS_MINOR_VERSION=$OS_MINOR_VERSION +COMPILER=$COMPILER +GCC_MAJOR_VERSION=$GCC_MAJOR_VERSION +GCC_MINOR_VERSION=$GCC_MINOR_VERSION +TCC_MAJOR_VERSION=$TCC_MAJOR_VERSION +TCC_MINOR_VERSION=$TCC_MINOR_VERSION +ICC_MAJOR_VERSION=$ICC_MAJOR_VERSION +ICC_MINOR_VERSION=$ICC_MINOR_VERSION +SPRO_MAJOR_VERSION=$SPRO_MAJOR_VERSION EOF ;; esac |