diff options
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/settings/settings.mk | 31 | ||||
| -rw-r--r-- | odk/source/unowinreg/win/makefile.mk | 2 |
2 files changed, 25 insertions, 8 deletions
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index 74c1393496b2..188ff880255e 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -498,13 +498,37 @@ ifneq (,$(findstring freebsd,$(PLATFORM))) PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1) -# Default is freebsd on a intel machine +ifeq (kfreebsd,$(findstring kfreebsd,$(PLATFORM))) +PLATFORM=kfreebsd +ifeq "$(PROCTYPE)" "x86_64" +PACKAGE_LIB_DIR=kfreebsd_x86_64.plt +UNOPKG_PLATFORM=kFreeBSD_x86_64 +else +PACKAGE_LIB_DIR=kfreebsd_x86.plt +UNOPKG_PLATFORM=kFreeBSD_x86 +endif +else PLATFORM=freebsd +ifeq "$(PROCTYPE)" "x86_64" +PACKAGE_LIB_DIR=freebsd_x86_64.plt +UNOPKG_PLATFORM=FreeBSD_x86_64 +else PACKAGE_LIB_DIR=freebsd_x86.plt UNOPKG_PLATFORM=FreeBSD_x86 +endif +endif + +ifeq "$(PROCTYPE)" "x86_64" +JAVA_PROC_TYPE=amd64 +else JAVA_PROC_TYPE=i386 +endif +ifeq (kfreebsd,$(findstring kfreebsd,$(PLATFORM))) +OS=LINUX +else OS=FREEBSD +endif PS=/ ICL=\$$ CC=gcc @@ -520,13 +544,8 @@ SHAREDLIB_OUT=$(OUT_LIB) GCC_VERSION=$(shell $(CC) -dumpversion) -ifeq "$(shell echo $(GCC_VERSION) | cut -c 1)" "3" COMID=gcc3 CPPU_ENV=gcc3 -else -COMID=GCC -CPPU_ENV=gcc2 -endif OSEP=\< CSEP=\> diff --git a/odk/source/unowinreg/win/makefile.mk b/odk/source/unowinreg/win/makefile.mk index eab0826a433c..077d8aa60aac 100644 --- a/odk/source/unowinreg/win/makefile.mk +++ b/odk/source/unowinreg/win/makefile.mk @@ -42,7 +42,6 @@ USE_DEFFILE=TRUE JAVA_INCLUDES:= -I$(JAVA_HOME)/include # values taken from set_soenv.in -.IF "$(JDK)" != "gcj" .IF "$(OS)" == "LINUX" JAVA_INCLUDES+= -I$(JAVA_HOME)/include/linux .ELIF "$(OS)" == "FREEBSD" @@ -52,7 +51,6 @@ JAVA_INCLUDES+= -I$(JAVA_HOME)/include/linux .ELIF "$(OS)" == "NETBSD" JAVA_INCLUDES+= -I$(JAVA_HOME)/include/netbsd .ENDIF -.ENDIF .IF "$(SOLAR_JAVA)"=="" nojava: |