janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-19 05:13:56 +01:00
Code Activity

defs.mk: Make it compile on SuSE 10.3 @ x86_64

Browse source
This commit is contained in:
Jan Lindemann 2008-05-01 12:37:26 +00:00 • committed by Jan Lindemann
commit ecb6741bc2
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
make/defs.mk
View file

@ -69,7 +69,11 @@ IMAGE_DIR ?= $(CVS_ROOT_DIR)/images
USE_GFILTER ?= true USE_GFILTER ?= true
TARGET ?= Linux TARGET ?= Linux
OS ?= $(shell sh $(MOD_SCRIPT_DIR)/get_os.sh) OS ?= $(shell sh $(MOD_SCRIPT_DIR)/get_os.sh)
ARCH = @ARCH@ ifeq ($(shell uname -m),x86_64)
ARCH = x86_64
else
ARCH = x86
endif
FULL_NAME = $(shell grep "^`id -nu`": /etc/passwd | cut -d: -f5) FULL_NAME = $(shell grep "^`id -nu`": /etc/passwd | cut -d: -f5)
DEVELOPMENT ?= $(shell echo $(VERSION) | grep -q 'dev' && echo true) DEVELOPMENT ?= $(shell echo $(VERSION) | grep -q 'dev' && echo true)
USE_PROJECT_LIB ?= true USE_PROJECT_LIB ?= true
@ -357,6 +361,12 @@ endif
LPPFLAGS += -lstdc++ LPPFLAGS += -lstdc++
ifeq ($(ARCH),x86_64)
CFLAGS += -fPIC
CPPFLAGS += -fPIC
LIBFLAGS +=
endif
ifeq ($(GCC_MAJOR),2) ifeq ($(GCC_MAJOR),2)
LPPFLAGS += -lm LPPFLAGS += -lm
CFLAGS += -I/usr/local/include CFLAGS += -I/usr/local/include
@ -367,13 +377,6 @@ else
LPPFLAGS += -lgcc_s LPPFLAGS += -lgcc_s
# LPPFLAGS += -L/usr/local/gcc3.3/lib # LPPFLAGS += -L/usr/local/gcc3.3/lib
endif endif
else
ifeq ($(GCC_MAJOR),4) # -PIC is more a thing with AMD64, I think
ifeq ($(TARGET),Linux)
CPPFLAGS += -fPIC
CFLAGS += -fPIC
endif
endif
endif endif
endif endif