Skip to content

Commit 0559838

Browse files
committed
make: export CFLAGS globally
autoconf and cmake will pick up the variable from the environment.
1 parent e88b164 commit 0559838

1 file changed

Lines changed: 4 additions & 29 deletions

File tree

Makefile

Lines changed: 4 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ DIST_DIR:=$(BASE_DIR)dist/libraries
77
GLOBAL_CFLAGS:=-O3 -s USE_PTHREADS=0
88
GLOBAL_LDFLAGS:=-s ENVIRONMENT=web,webview,worker -s NO_EXIT_RUNTIME=1
99
export LDFLAGS = $(GLOBAL_LDFLAGS)
10+
export CFLAGS = $(GLOBAL_CFLAGS)
11+
export CXXFLAGS = $(GLOBAL_CFLAGS)
1012

1113
export PKG_CONFIG_PATH = $(DIST_DIR)/lib/pkgconfig
1214
export EM_PKG_CONFIG_PATH = $(PKG_CONFIG_PATH)
@@ -26,9 +28,6 @@ build/lib/fribidi/configure: lib/fribidi $(wildcard $(BASE_DIR)build/patches/fri
2628
$(DIST_DIR)/lib/libfribidi.a: build/lib/fribidi/configure
2729
cd build/lib/fribidi && \
2830
emconfigure ./configure \
29-
CFLAGS=" \
30-
$(GLOBAL_CFLAGS) \
31-
" \
3231
--prefix="$(DIST_DIR)" \
3332
--host=x86-none-linux \
3433
--build=x86_64 \
@@ -47,9 +46,6 @@ build/lib/expat/configured: lib/expat
4746
$(DIST_DIR)/lib/libexpat.a: build/lib/expat/configured
4847
cd build/lib/expat && \
4948
emcmake cmake \
50-
-DCMAKE_C_FLAGS=" \
51-
$(GLOBAL_CFLAGS) \
52-
" \
5349
-DCMAKE_INSTALL_PREFIX=$(DIST_DIR) \
5450
-DEXPAT_BUILD_DOCS=off \
5551
-DEXPAT_SHARED_LIBS=off \
@@ -72,9 +68,6 @@ $(DIST_DIR)/lib/libbrotlidec.a: $(DIST_DIR)/lib/libbrotlicommon.a
7268
$(DIST_DIR)/lib/libbrotlicommon.a: build/lib/brotli/configured
7369
cd build/lib/brotli && \
7470
emcmake cmake \
75-
-DCMAKE_C_FLAGS=" \
76-
$(GLOBAL_CFLAGS) \
77-
" \
7871
-DCMAKE_INSTALL_PREFIX=$(DIST_DIR) \
7972
. \
8073
&& \
@@ -95,9 +88,6 @@ build/lib/freetype/build_hb/dist_hb/lib/libfreetype.a: $(DIST_DIR)/lib/libbrotli
9588
mkdir -p build_hb && \
9689
cd build_hb && \
9790
emconfigure ../configure \
98-
CFLAGS=" \
99-
$(GLOBAL_CFLAGS) \
100-
" \
10191
--prefix="$$(pwd)/dist_hb" \
10292
--host=x86-none-linux \
10393
--build=x86_64 \
@@ -118,15 +108,9 @@ build/lib/harfbuzz/configure: lib/harfbuzz $(wildcard $(BASE_DIR)build/patches/h
118108
$(DIST_DIR)/lib/libharfbuzz.a: build/lib/freetype/build_hb/dist_hb/lib/libfreetype.a build/lib/harfbuzz/configure
119109
cd build/lib/harfbuzz && \
120110
EM_PKG_CONFIG_PATH=$(PKG_CONFIG_PATH):$(BASE_DIR)build/lib/freetype/build_hb/dist_hb/lib/pkgconfig \
111+
CFLAGS="-DHB_NO_MT $(CFLAGS)" \
112+
CXXFLAGS="-DHB_NO_MT $(CFLAGS)" \
121113
emconfigure ./configure \
122-
CFLAGS=" \
123-
$(GLOBAL_CFLAGS) \
124-
-DHB_NO_MT \
125-
" \
126-
CXXFLAGS=" \
127-
$(GLOBAL_CFLAGS) \
128-
-DHB_NO_MT \
129-
" \
130114
--prefix="$(DIST_DIR)" \
131115
--host=x86-none-linux \
132116
--build=x86_64 \
@@ -144,9 +128,6 @@ $(DIST_DIR)/lib/libfreetype.a: $(DIST_DIR)/lib/libharfbuzz.a $(DIST_DIR)/lib/lib
144128
cd build/lib/freetype && \
145129
EM_PKG_CONFIG_PATH=$(PKG_CONFIG_PATH):$(BASE_DIR)build/lib/freetype/build_hb/dist_hb/lib/pkgconfig \
146130
emconfigure ./configure \
147-
CFLAGS=" \
148-
$(GLOBAL_CFLAGS) \
149-
" \
150131
--prefix="$(DIST_DIR)" \
151132
--host=x86-none-linux \
152133
--build=x86_64 \
@@ -167,9 +148,6 @@ build/lib/fontconfig/configure: lib/fontconfig $(wildcard $(BASE_DIR)build/patch
167148
$(DIST_DIR)/lib/libfontconfig.a: $(DIST_DIR)/lib/libharfbuzz.a $(DIST_DIR)/lib/libexpat.a $(DIST_DIR)/lib/libfribidi.a $(DIST_DIR)/lib/libfreetype.a build/lib/fontconfig/configure
168149
cd build/lib/fontconfig && \
169150
emconfigure ./configure \
170-
CFLAGS=" \
171-
$(GLOBAL_CFLAGS) \
172-
" \
173151
--prefix="$(DIST_DIR)" \
174152
--host=x86-none-linux \
175153
--build=x86_64 \
@@ -192,9 +170,6 @@ build/lib/libass/configured: lib/libass
192170
$(DIST_DIR)/lib/libass.a: $(DIST_DIR)/lib/libfontconfig.a $(DIST_DIR)/lib/libharfbuzz.a $(DIST_DIR)/lib/libexpat.a $(DIST_DIR)/lib/libfribidi.a $(DIST_DIR)/lib/libfreetype.a $(DIST_DIR)/lib/libbrotlidec.a build/lib/libass/configured
193171
cd build/lib/libass && \
194172
emconfigure ../../../lib/libass/configure \
195-
CFLAGS=" \
196-
$(GLOBAL_CFLAGS) \
197-
" \
198173
--prefix="$(DIST_DIR)" \
199174
--host=x86-none-linux \
200175
--build=x86_64 \

0 commit comments

Comments
 (0)