Kaydet (Commit) 94874566 authored tarafından Michael Stahl's avatar Michael Stahl

configure: add vars for Solaris/SPARC64 (already checked in vcl)

Change-Id: Ic27986d8d45f61facedf2400b77334aaf1da7c1e
üst 8c85ae05
...@@ -4326,6 +4326,13 @@ solaris*) ...@@ -4326,6 +4326,13 @@ solaris*)
PLATFORMID=solaris_sparc PLATFORMID=solaris_sparc
OUTPATH=unxsogs OUTPATH=unxsogs
;; ;;
sparc64)
CPU=U
CPUNAME=SPARC64
RTL_ARCH=SPARC64
PLATFORMID=solaris_sparc64
OUTPATH=unxsogu
;;
*) *)
AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os]) AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
;; ;;
......
...@@ -20,7 +20,7 @@ $(call gb_ExternalProject_get_state_target,hyphen,build): ...@@ -20,7 +20,7 @@ $(call gb_ExternalProject_get_state_target,hyphen,build):
./configure --disable-shared \ ./configure --disable-shared \
$(if $(filter-out IOS,$(OS)),--with-pic) \ $(if $(filter-out IOS,$(OS)),--with-pic) \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no) \
$(if $(filter C52U,$(COM)$(CPU)),CFLAGS="-m64") \ $(if $(filter C52-SPARC64,$(COM)-$(CPUNAME)),CFLAGS="-m64") \
&& $(MAKE) \ && $(MAKE) \
) )
......
...@@ -19,7 +19,7 @@ $(call gb_ExternalProject_get_state_target,mythes,build): ...@@ -19,7 +19,7 @@ $(call gb_ExternalProject_get_state_target,mythes,build):
$(call gb_ExternalProject_run,build,\ $(call gb_ExternalProject_run,build,\
LIBS="$(gb_STDLIBS) $(LIBS)" ./configure --disable-shared --with-pic \ LIBS="$(gb_STDLIBS) $(LIBS)" ./configure --disable-shared --with-pic \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no) \
$(if $(filter C52U,$(COM)$(CPU)),CFLAGS="-m64") \ $(if $(filter C52-SPARC64,$(COM)-$(CPUNAME)),CFLAGS="-m64") \
&& $(MAKE) \ && $(MAKE) \
) )
......
...@@ -16,14 +16,14 @@ $(eval $(call gb_CustomTarget_register_targets,odk/check,\ ...@@ -16,14 +16,14 @@ $(eval $(call gb_CustomTarget_register_targets,odk/check,\
odk_PLATFORM := $(if $(filter WNT,$(OS)),\ odk_PLATFORM := $(if $(filter WNT,$(OS)),\
$(if $(filter GCC,$(COM)),mingw,windows),\ $(if $(filter GCC,$(COM)),mingw,windows),\
$(if $(filter SOLARIS,$(OS)),\ $(if $(filter SOLARIS,$(OS)),\
$(if $(filter SPARC,$(CPUNAME)),solsparc,\ $(if $(filter SPARC,$(CPUNAME)),solsparc,\
$(if $(filter U,$(CPU)),solsparc64,solintel)),\ $(if $(filter SPARC64,$(CPUNAME)),solsparc64,solintel)),\
$(if $(filter LINUX,$(OS)),linux,\ $(if $(filter LINUX,$(OS)),linux,\
$(if $(filter NETBSD,$(OS)),netbsd,\ $(if $(filter NETBSD,$(OS)),netbsd,\
$(if $(filter FREEBSD,$(OS)),freebsd,\ $(if $(filter FREEBSD,$(OS)),freebsd,\
$(if $(filter DRAGONFLY,$(OS)),dragonfly,\ $(if $(filter DRAGONFLY,$(OS)),dragonfly,\
$(if $(filter MACOSX,$(OS)),macosx,\ $(if $(filter MACOSX,$(OS)),macosx,\
$(if $(filter AIX,$(OS)),aix)))))))) $(if $(filter AIX,$(OS)),aix))))))))
$(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
$(SRCDIR)/odk/util/check.pl \ $(SRCDIR)/odk/util/check.pl \
......
...@@ -661,7 +661,7 @@ $(eval $(call gb_Library_add_libs,vcl,\ ...@@ -661,7 +661,7 @@ $(eval $(call gb_Library_add_libs,vcl,\
endif endif
ifeq ($(OS),SOLARIS) ifeq ($(OS),SOLARIS)
ifeq ($(CPUNAME)$(CPU),SPARCU) ifeq ($(CPUNAME),SPARC64)
$(eval $(call gb_Library_add_ldflags,vcl,\ $(eval $(call gb_Library_add_ldflags,vcl,\
-R/usr/sfw/lib/64 \ -R/usr/sfw/lib/64 \
)) ))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment