Skip to content

Commit 5b50a2f

Browse files
committed
[Fix] build: Makefile: Emscripten: Fix build. Broken since r22884.
git-svn-id: https://source.openmpt.org/svn/openmpt/trunk/OpenMPT@22941 56274372-70c3-4bfc-bfc3-4c3a0b034d27
1 parent 41e5ad4 commit 5b50a2f

File tree

3 files changed

+6
-0
lines changed

3 files changed

+6
-0
lines changed

build/make/config-emscripten.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,8 @@ CFLAGS += -s DISABLE_EXCEPTION_CATCHING=0 -fno-strict-aliasing
144144
LDFLAGS += -s DISABLE_EXCEPTION_CATCHING=0 -s ERROR_ON_UNDEFINED_SYMBOLS=1 -s ERROR_ON_MISSING_LIBRARIES=1 -s EXPORT_NAME="'libopenmpt'"
145145
SO_LDFLAGS += -s EXPORTED_FUNCTIONS="['_malloc','_free']"
146146

147+
NO_NO_UNDEFINED_LINKER_FLAG=1
148+
147149
include build/make/warnings-clang.mk
148150

149151
REQUIRES_RUNPREFIX=1

build/make/warnings-clang.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ endif
1515
#CXXFLAGS_WARNINGS += -Wconversion
1616
#CXXFLAGS_WARNINGS += -Weverything -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-c++98-c++11-c++14-compat -Wno-padded -Wno-weak-vtables -Wno-sign-conversion -Wno-shadow-field-in-constructor -Wno-conversion -Wno-switch-enum -Wno-old-style-cast
1717

18+
ifneq ($(NO_NO_UNDEFINED_LINKER_FLAG),1)
1819
LDFLAGS_WARNINGS += -Wl,--no-undefined
20+
endif
1921

2022
ifeq ($(MODERN),1)
2123
CXXFLAGS_WARNINGS +=

build/make/warnings-gcc.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ CFLAGS_WARNINGS += -Wcast-align -Wcast-qual -Wdouble-promotion -Wfloat-convers
44

55
CXXFLAGS_WARNINGS += -Wno-psabi
66

7+
ifneq ($(NO_NO_UNDEFINED_LINKER_FLAG),1)
78
LDFLAGS_WARNINGS += -Wl,--no-undefined
9+
endif
810

911
ifeq ($(MODERN),1)
1012
# GCC >= 12

0 commit comments

Comments
 (0)