Skip to content

Commit 653c990

Browse files
Merge pull request #235 from OpenSmalltalk/compile_sista_with_clang
Compile sista with clang
2 parents 1614d95 + 005405c commit 653c990

File tree

6 files changed

+44
-35
lines changed

6 files changed

+44
-35
lines changed

.appveyor.yml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,47 @@ environment:
33
BINTRAYAPIKEY:
44
secure: uknPzww818XWJiLecwur9p1MfrkACOyx9d3iNrw/TuD89EoPSc8zLqKdPZjWdcQd
55
matrix:
6-
- FLAVOR: squeak.sista.spur
6+
- FLAVOR: squeak.cog.spur
77
ARCH: win32x86
88
CYG_ROOT: C:\cygwin
99
CYG_SETUP: setup-x86.exe
1010
MINGW_ARCH: i686
1111
- FLAVOR: squeak.cog.spur
12+
ARCH: win64x64
13+
CYG_ROOT: C:\cygwin64
14+
CYG_SETUP: setup-x86_64.exe
15+
MINGW_ARCH: x86_64
16+
- FLAVOR: pharo.cog.spur
1217
ARCH: win32x86
1318
CYG_ROOT: C:\cygwin
1419
CYG_SETUP: setup-x86.exe
1520
MINGW_ARCH: i686
16-
- FLAVOR: squeak.cog.spur.lowcode
21+
- FLAVOR: pharo.cog.spur
22+
ARCH: win64x64
23+
CYG_ROOT: C:\cygwin64
24+
CYG_SETUP: setup-x86_64.exe
25+
MINGW_ARCH: x86_64
26+
- FLAVOR: squeak.sista.spur
1727
ARCH: win32x86
1828
CYG_ROOT: C:\cygwin
1929
CYG_SETUP: setup-x86.exe
2030
MINGW_ARCH: i686
21-
- FLAVOR: squeak.cog.v3
31+
- FLAVOR: squeak.cog.spur.lowcode
2232
ARCH: win32x86
2333
CYG_ROOT: C:\cygwin
2434
CYG_SETUP: setup-x86.exe
2535
MINGW_ARCH: i686
26-
- FLAVOR: squeak.stack.spur
36+
- FLAVOR: squeak.cog.v3
2737
ARCH: win32x86
2838
CYG_ROOT: C:\cygwin
2939
CYG_SETUP: setup-x86.exe
3040
MINGW_ARCH: i686
31-
- FLAVOR: squeak.stack.v3
41+
- FLAVOR: squeak.stack.spur
3242
ARCH: win32x86
3343
CYG_ROOT: C:\cygwin
3444
CYG_SETUP: setup-x86.exe
3545
MINGW_ARCH: i686
36-
- FLAVOR: pharo.cog.spur
46+
- FLAVOR: squeak.stack.v3
3747
ARCH: win32x86
3848
CYG_ROOT: C:\cygwin
3949
CYG_SETUP: setup-x86.exe
@@ -58,16 +68,6 @@ environment:
5868
CYG_ROOT: C:\cygwin
5969
CYG_SETUP: setup-x86.exe
6070
MINGW_ARCH: i686
61-
- FLAVOR: squeak.cog.spur
62-
ARCH: win64x64
63-
CYG_ROOT: C:\cygwin64
64-
CYG_SETUP: setup-x86_64.exe
65-
MINGW_ARCH: x86_64
66-
- FLAVOR: pharo.cog.spur
67-
ARCH: win64x64
68-
CYG_ROOT: C:\cygwin64
69-
CYG_SETUP: setup-x86_64.exe
70-
MINGW_ARCH: x86_64
7171
# - FLAVOR: pharo.sista.spur
7272
# ARCH: win64x64
7373
# CYG_ROOT: C:\cygwin64
@@ -113,8 +113,8 @@ cache:
113113
- .thirdparty-cache
114114

115115
install:
116-
- ps: 'Start-FileDownload "http://cygwin.com/setup-x86.exe" -FileName "setup-x86.exe"'
117-
- ps: 'Start-FileDownload "http://cygwin.com/setup-x86_64.exe" -FileName "setup-x86_64.exe"'
116+
- 'curl -fsSL --retry 4 -m 600 -o "setup-x86.exe" "http://cygwin.com/setup-x86.exe" '
117+
- 'curl -fsSL --retry 4 -m 600 -o "setup-x86_64.exe" "http://cygwin.com/setup-x86_64.exe" '
118118
- '%CYG_SETUP% -dgnqNO -R "%CYG_ROOT%" -s "%CYG_MIRROR%" -l "%CYG_ROOT%\var\cache\setup" -P mingw64-%MINGW_ARCH%-gcc-core,mingw64-%MINGW_ARCH%-gcc-g++,mingw64-%MINGW_ARCH%-headers,mingw64-%MINGW_ARCH%-runtime,zip,mingw64-%MINGW_ARCH%-clang,mingw64-%MINGW_ARCH%-openssl,libiconv-devel,libglib2.0-devel,perl,mingw64-%MINGW_ARCH%-zlib,make,cmake,wget,mingw64-%MINGW_ARCH%-win-iconv'
119119

120120
# Cygwin build script

.travis.yml

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,42 +23,46 @@ notifications:
2323
jobs:
2424
fast_finish: true
2525
include:
26-
- stage: "Linux builds"
27-
env: ARCH="linux64x64" FLAVOR="newspeak.cog.spur"
26+
- stage: "Main Squeak and Pharo builds"
27+
env: ARCH="linux32x86" FLAVOR="squeak.cog.spur"
28+
- env: ARCH="macos32x86" FLAVOR="squeak.cog.spur"
29+
<<: *mac-build
2830
- env: ARCH="linux64x64" FLAVOR="squeak.cog.spur"
31+
- env: ARCH="macos64x64" FLAVOR="squeak.cog.spur"
32+
<<: *mac-build
33+
- env: ARCH="linux32x86" FLAVOR="pharo.cog.spur" HEARTBEAT="threaded"
34+
- env: ARCH="macos32x86" FLAVOR="pharo.cog.spur"
35+
<<: *mac-build
2936
- env: ARCH="linux64x64" FLAVOR="pharo.cog.spur" HEARTBEAT="threaded"
37+
- env: ARCH="macos64x64" FLAVOR="pharo.cog.spur"
38+
<<: *mac-build
39+
40+
- stage: "Other Linux builds"
41+
env: ARCH="linux64x64" FLAVOR="newspeak.cog.spur"
3042
- env: ARCH="linux64x64" FLAVOR="pharo.cog.spur" HEARTBEAT="itimer"
3143
# - env: ARCH="linux64x64" FLAVOR="pharo.sista.spur" HEARTBEAT="threaded"
3244
- env: ARCH="linux32x86" FLAVOR="newspeak.cog.spur"
33-
- env: ARCH="linux32x86" FLAVOR="squeak.cog.spur"
3445
- env: ARCH="linux32x86" FLAVOR="squeak.cog.v3"
3546
- env: ARCH="linux32x86" FLAVOR="squeak.sista.spur"
36-
- env: ARCH="linux32x86" FLAVOR="pharo.cog.spur" HEARTBEAT="threaded"
3747
- env: ARCH="linux32x86" FLAVOR="pharo.cog.spur" HEARTBEAT="itimer"
3848
- env: ARCH="linux32x86" FLAVOR="pharo.sista.spur" HEARTBEAT="threaded"
39-
- env: ARCH="linux32x86" FLAVOR="pharo.sista.spur" HEARTBEAT="itimer"
49+
compiler: clang
50+
- env: ARCH="linux32x86" FLAVOR="pharo.sista.spur" HEARTBEAT="itimer"
51+
compiler: clang
4052

41-
- stage: "Mac builds"
53+
- stage: "Other Mac builds"
4254
env: ARCH="macos64x64" FLAVOR="newspeak.cog.spur"
4355
<<: *mac-build
44-
- env: ARCH="macos64x64" FLAVOR="pharo.cog.spur"
45-
<<: *mac-build
4656
# - env: ARCH="macos64x64" FLAVOR="pharo.sista.spur"
4757
# <<: *mac-build
4858
- env: ARCH="macos64x64" FLAVOR="pharo.cog.spur.lowcode"
4959
<<: *mac-build
50-
- env: ARCH="macos64x64" FLAVOR="squeak.cog.spur"
51-
<<: *mac-build
5260
- env: ARCH="macos32x86" FLAVOR="newspeak.cog.spur"
5361
<<: *mac-build
54-
- env: ARCH="macos32x86" FLAVOR="pharo.cog.spur"
55-
<<: *mac-build
5662
- env: ARCH="macos32x86" FLAVOR="pharo.sista.spur"
5763
<<: *mac-build
5864
- env: ARCH="macos32x86" FLAVOR="pharo.cog.spur.lowcode"
5965
<<: *mac-build
60-
- env: ARCH="macos32x86" FLAVOR="squeak.cog.spur"
61-
<<: *mac-build
6266
- env: ARCH="macos32x86" FLAVOR="squeak.cog.v3"
6367
<<: *mac-build
6468
- env: ARCH="macos32x86" FLAVOR="squeak.sista.spur"

build.linux32x86/pharo.sista.spur/build/mvm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,12 @@ esac
3333
test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
3434
test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
3535

36-
test -f config.h || ../../../platforms/unix/config/configure \
36+
test -f config.h || CC=clang ../../../platforms/unix/config/configure \
3737
--without-npsqueak \
3838
--with-vmversion=5.0 \
3939
--with-src=spursistasrc \
4040
TARGET_ARCH="-m32" \
41+
CC=clang \
4142
CFLAGS="$OPT -msse2 -DCOGMTVM=0" \
4243
LDFLAGS="-Wl,-rpath,'\$\$ORIGIN' "
4344
rm -f vm/sqUnixMain.o # nuke version info

build.win32x86/pharo.cog.spur.lowcode/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ VMSRCDIR:=../../spurlowcodesrc/vm
1515
#COGDEFS:= -DPharoVM=1 -DSTACK_ALIGN_BYTES=16 -DALLOCA_LIES_SO_USE_GETSP=0
1616
COGDEFS:= -DPharoVM=1
1717

18+
COMPILER_TO_USE:=clang
19+
1820
THIRDPARTYLIBS:=pkgconfig openssl libssh2 libgit2 libsdl2 zlib libpng freetype2 pixman cairo libgcc
1921

2022
include ../common/Makefile

build.win32x86/pharo.sista.spur/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ COGDEFS:= -DPharoVM=1
1717

1818
THIRDPARTYLIBS:=pkgconfig openssl libssh2 libgit2 libsdl2 zlib libpng freetype2 pixman cairo libgcc
1919

20+
COMPILER_TO_USE:=clang
21+
2022
include ../common/Makefile
2123

2224
# third-party libraries
@@ -35,4 +37,4 @@ include ../third-party/Makefile.libgcc
3537

3638
# Since SDLDisplayPlugin will be included as internal plugin, we need to add the library to the path
3739
# add to the end to allow thirdparty vars to be defined.
38-
STDLIBS+= -L$(THIRDPARTYOUTDIR)/lib -lSDL2
40+
STDLIBS+= -L$(THIRDPARTYOUTDIR)/lib -lSDL2

platforms/unix/vm-sound-ALSA/sqUnixSoundALSA.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,7 @@ mixer_default_volume_get_set(int captureFlag, double *get, double set)
670670

671671
if (mixer.error) {
672672
mixer_close(&mixer);
673-
return;
673+
return -1;
674674
}
675675

676676
/* Iterate over all mixer controls */

0 commit comments

Comments
 (0)