diff options
| author | Andreas Baumann <abaumann@yahoo.com> | 2009-03-10 12:54:04 +0100 |
|---|---|---|
| committer | Andreas Baumann <abaumann@yahoo.com> | 2009-03-10 12:54:04 +0100 |
| commit | a6b606fd903e4c7dd188fe6a8dd35ed583e54cbf (patch) | |
| tree | d4cb10c8ca01bbba134a1474569a1d957f9df444 /makefiles | |
| parent | c84d22783b0ef98d30aa413b36e9fdcb69b69101 (diff) | |
| download | wolfbones-a6b606fd903e4c7dd188fe6a8dd35ed583e54cbf.tar.gz wolfbones-a6b606fd903e4c7dd188fe6a8dd35ed583e54cbf.tar.bz2 | |
fixed CURDIR issues with spaces in platform guessing
Diffstat (limited to 'makefiles')
| -rw-r--r-- | makefiles/gmake/compiler.mk | 12 | ||||
| -rwxr-xr-x | makefiles/gmake/guess_env | 4 | ||||
| -rw-r--r-- | makefiles/gmake/platform.mk | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/makefiles/gmake/compiler.mk b/makefiles/gmake/compiler.mk index 848e1c8..6bae2c7 100644 --- a/makefiles/gmake/compiler.mk +++ b/makefiles/gmake/compiler.mk @@ -15,8 +15,8 @@ ifeq "$(COMPILER)" "gcc" -GCC_MAJOR_VERSION ?= $(shell $(TOPDIR)/makefiles/gmake/guess_env --gcc-major-version $(CC) $(CURDIR) $(TOPDIR)) -GCC_MINOR_VERSION ?= $(shell $(TOPDIR)/makefiles/gmake/guess_env --gcc-minor-version $(CC) $(CURDIR) $(TOPDIR)) +GCC_MAJOR_VERSION ?= $(shell $(TOPDIR)/makefiles/gmake/guess_env --gcc-major-version $(CC) "$(CURDIR)" $(TOPDIR)) +GCC_MINOR_VERSION ?= $(shell $(TOPDIR)/makefiles/gmake/guess_env --gcc-minor-version $(CC) "$(CURDIR)" $(TOPDIR)) # -Wswitch-default: not good for switches with enums # -Wsystem-headers: bad idea, as header files are usually happily broken :-) @@ -151,8 +151,8 @@ endif # start of tcc section # currently we don't need this, the tcc flags are fairly consistent -#TCC_MAJOR_VERSION ?= $(shell $(TOPDIR)/makefiles/gmake/guess_env --tcc-major-version $(CC) $(CURDIR) $(TOPDIR)) -#TCC_MINOR_VERSION ?= $(shell $(TOPDIR)/makefiles/gmake/guess_env --tcc-minor-version $(CC) $(CURDIR) $(TOPDIR)) +#TCC_MAJOR_VERSION ?= $(shell $(TOPDIR)/makefiles/gmake/guess_env --tcc-major-version $(CC) "$(CURDIR)" $(TOPDIR)) +#TCC_MINOR_VERSION ?= $(shell $(TOPDIR)/makefiles/gmake/guess_env --tcc-minor-version $(CC) "$(CURDIR)" $(TOPDIR)) ifeq "$(COMPILER)" "tcc" COMPILE_FLAGS = \ @@ -164,8 +164,8 @@ endif # start of icc section # currently we don't need this, the icc flags are fairly consistent -#ICC_MAJOR_VERSION ?= $(shell $(TOPDIR)/makefiles/gmake/guess_env --icc-major-version $(CC) $(CURDIR) $(TOPDIR)) -#ICC_MINOR_VERSION ?= $(shell $(TOPDIR)/makefiles/gmake/guess_env --icc-minor-version $(CC) $(CURDIR) $(TOPDIR)) +#ICC_MAJOR_VERSION ?= $(shell $(TOPDIR)/makefiles/gmake/guess_env --icc-major-version $(CC) "$(CURDIR)" $(TOPDIR)) +#ICC_MINOR_VERSION ?= $(shell $(TOPDIR)/makefiles/gmake/guess_env --icc-minor-version $(CC) "$(CURDIR)" $(TOPDIR)) # -vec-report0: turn of SSE2 vector usage messages (they are common since P-4 anyway!) diff --git a/makefiles/gmake/guess_env b/makefiles/gmake/guess_env index a1679b3..3a7fdf6 100755 --- a/makefiles/gmake/guess_env +++ b/makefiles/gmake/guess_env @@ -159,8 +159,8 @@ esac MAKEFILE_DIR="$3/$4" # regenerate the cache file, otherwise building is far too slow! -if test ! -f ${MAKEFILE_DIR}/makefiles/gmake/platform.mk.vars; then - cat >${MAKEFILE_DIR}/makefiles/gmake/platform.mk.vars <<EOF +if test ! -f "${MAKEFILE_DIR}/makefiles/gmake/platform.mk.vars"; then + cat >"${MAKEFILE_DIR}/makefiles/gmake/platform.mk.vars" <<EOF ARCH=$ARCH PLATFORM=$PLATFORM OS_MAJOR_VERSION=$OS_MAJOR_VERSION diff --git a/makefiles/gmake/platform.mk b/makefiles/gmake/platform.mk index ba3e8d0..87dc2d5 100644 --- a/makefiles/gmake/platform.mk +++ b/makefiles/gmake/platform.mk @@ -18,10 +18,10 @@ -include $(TOPDIR)/makefiles/gmake/platform.mk.vars -PLATFORM ?= $(shell $(TOPDIR)/makefiles/gmake/guess_env --platform $(CC) $(CURDIR) $(TOPDIR)) -OS_MAJOR_VERSION ?= $(shell $(TOPDIR)/makefiles/gmake/guess_env --os-major-version $(CC) $(CURDIR) $(TOPDIR)) -OS_MINOR_VERSION ?= $(shell $(TOPDIR)/makefiles/gmake/guess_env --os-minor-version $(CC) $(CURDIR) $(TOPDIR)) -COMPILER ?= $(shell $(TOPDIR)/makefiles/gmake/guess_env --compiler $(CC) $(CURDIR) $(TOPDIR)) +PLATFORM ?= $(shell $(TOPDIR)/makefiles/gmake/guess_env --platform $(CC) "$(CURDIR)" $(TOPDIR)) +OS_MAJOR_VERSION ?= $(shell $(TOPDIR)/makefiles/gmake/guess_env --os-major-version $(CC) "$(CURDIR)" $(TOPDIR)) +OS_MINOR_VERSION ?= $(shell $(TOPDIR)/makefiles/gmake/guess_env --os-minor-version $(CC) "$(CURDIR)" $(TOPDIR)) +COMPILER ?= $(shell $(TOPDIR)/makefiles/gmake/guess_env --compiler $(CC) "$(CURDIR)" $(TOPDIR)) PLATFORM_COMPILE_FLAGS = \ -D$(PLATFORM) \ |