Test Travis Xenial build
I can't test on my fork at the moment because it is tied up with some other changes. Also see https://blog.travis-ci.com/2018-11-08-xenial-release.pull/757/head
parent
482151a980
commit
cdefa5befe
|
|
@ -4,7 +4,7 @@ os:
|
|||
- linux
|
||||
- osx
|
||||
|
||||
dist: trusty
|
||||
dist: xenial
|
||||
sudo: required
|
||||
|
||||
# OS X only supports one image. Use the latest.
|
||||
|
|
|
|||
32
GNUmakefile
32
GNUmakefile
|
|
@ -801,10 +801,12 @@ ifeq ($(IS_SUN)$(SUN_COMPILER),11)
|
|||
endif # X86/X32/X64
|
||||
endif # SunOS
|
||||
|
||||
# TODO: can we remove this since removing sockets?
|
||||
ifneq ($(IS_MINGW),0)
|
||||
LDLIBS += -lws2_32
|
||||
endif
|
||||
|
||||
# TODO: can we remove this since removing sockets?
|
||||
ifneq ($(IS_SUN),0)
|
||||
LDLIBS += -lnsl -lsocket
|
||||
endif
|
||||
|
|
@ -841,13 +843,29 @@ endif # No ASM
|
|||
|
||||
# Native build testing. Issue 'make native'.
|
||||
ifeq ($(findstring native,$(MAKECMDGOALS)),native)
|
||||
ifeq ($(findstring -march=native,$(CXXFLAGS)),)
|
||||
ifeq ($(IS_SUN)$(SUN_COMPILER),11)
|
||||
CXXFLAGS += -native
|
||||
else
|
||||
CXXFLAGS += -march=native
|
||||
endif # CXXFLAGS
|
||||
endif # Sun
|
||||
NATIVE_OPT =
|
||||
|
||||
# Try GCC and compatibles first
|
||||
TPROG = TestPrograms/test_cxx.cxx
|
||||
TOPT = -march=native
|
||||
HAVE_OPT = $(shell $(CXX) $(TCXXFLAGS) $(ZOPT) $(TOPT) $(TPROG) -o $(TOUT) 2>&1 | tr ' ' '\n' | wc -l)
|
||||
ifeq ($(strip $(HAVE_OPT)),0)
|
||||
NATIVE_OPT = -march=native
|
||||
endif # NATIVE_OPT
|
||||
|
||||
# Try SunCC next
|
||||
ifeq ($(NATIVE_OPT),)
|
||||
TOPT = -native
|
||||
HAVE_OPT = $(shell $(CXX) $(TCXXFLAGS) $(ZOPT) $(TOPT) $(TPROG) -o $(TOUT) 2>&1 | tr ' ' '\n' | wc -l)
|
||||
ifeq ($(strip $(HAVE_OPT)),0)
|
||||
NATIVE_OPT = -native
|
||||
endif # NATIVE_OPT
|
||||
endif
|
||||
|
||||
ifneq ($(NATIVE_OPT),)
|
||||
CXXFLAGS += $(NATIVE_OPT)
|
||||
endif
|
||||
|
||||
endif # Native
|
||||
|
||||
# Undefined Behavior Sanitizer (UBsan) testing. Issue 'make ubsan'.
|
||||
|
|
|
|||
Loading…
Reference in New Issue