File tree Expand file tree Collapse file tree 2 files changed +13
-19
lines changed
Expand file tree Collapse file tree 2 files changed +13
-19
lines changed Original file line number Diff line number Diff line change @@ -2,35 +2,28 @@ name: Build
22on : [push]
33jobs :
44 Build :
5- runs-on : macos-12
5+ runs-on : macos-latest
66 steps :
77 - uses : actions/checkout@v3
88
99 - name : Install dependencies
10- run : brew install autoconf automake bison pkg-config boost
10+ run : brew install autoconf automake bison pkg-config boost libtool
1111
12- - name : Boostrap
12+ - name : Update environment variables
1313 run : |
14- export PATH="/usr/local/opt/bison/bin:$PATH"
15-
16- ./bootstrap.sh
17-
18- - name : Configure
19- run : |
20- export PATH="/usr/local/opt/bison/bin:$PATH"
21-
14+ echo "/opt/homebrew/opt/bison/bin" >> $GITHUB_PATH
15+ export LDFLAGS="-L/opt/homebrew/opt/bison/lib"
2216 export CFLAGS="-Wno-deprecated-copy-with-user-provided-copy"
2317 export CXXFLAGS="-Wno-deprecated-copy-with-user-provided-copy"
2418
25- ./configure
19+ - name : Boostrap
20+ run : ./bootstrap.sh
21+
22+ - name : Configure
23+ run : ./configure
2624
2725 - name : Make
2826 run : |
29- export PATH="/usr/local/opt/bison/bin:$PATH"
30-
31- export CFLAGS="-Wno-deprecated-copy-with-user-provided-copy"
32- export CXXFLAGS="-Wno-deprecated-copy-with-user-provided-copy"
33-
3427 cd ./compiler/cpp
3528 make
3629
4134 run : zip -j ./thrift.zip ./compiler/cpp/thrift
4235
4336 - name : ' Upload Artifact'
44- uses : actions/upload-artifact@v2
37+ uses : actions/upload-artifact@v4
4538 with :
4639 name : thrift.zip
4740 path : ./thrift.zip
Original file line number Diff line number Diff line change 2222# details.
2323
2424AUTOMAKE_OPTIONS = subdir-objects
25+ BOOST_LIB := $(shell brew --prefix boost)
2526
2627# Note on why we have src/thrift and src/thrift/plugin directories:
2728# Since Automake supports only one set of BUILT_SOURCES per file and does not allow
@@ -121,7 +122,7 @@ thrift_SOURCES += src/thrift/generate/t_c_glib_generator.cc \
121122 src/thrift/generate/t_lua_generator.cc \
122123 src/thrift/generate/t_rs_generator.cc
123124
124- thrift_CPPFLAGS = -I$(srcdir ) /src
125+ thrift_CPPFLAGS = -I$(srcdir ) /src -I $( BOOST_LIB ) /include
125126thrift_CXXFLAGS = -Wall -Wextra -pedantic -Werror
126127thrift_LDADD = @LEXLIB@ src/thrift/libparse.a
127128
You can’t perform that action at this time.
0 commit comments