diff options
| author | stijn <stijn@ignitron.net> | 2022-02-15 10:16:46 +0100 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2022-02-18 14:40:16 +1100 |
| commit | 8bb50c6301f5b3df143fff7a425f284e88a0b64d (patch) | |
| tree | edc32b1492ba8a9e252f4ec5e87950fea504f7da | |
| parent | 9c05f3aa1d201ba943c7852bee975f8b7d48e235 (diff) | |
| download | micropython-8bb50c6301f5b3df143fff7a425f284e88a0b64d.tar.gz micropython-8bb50c6301f5b3df143fff7a425f284e88a0b64d.zip | |
unix/Makefile: Remove explicit addition of -std=c++ flag.
This was added merely for building the C++ user module example, so it's a
better fit to add it in the corresponding micropython.mk.
| -rw-r--r-- | examples/usercmodule/cppexample/micropython.mk | 2 | ||||
| -rw-r--r-- | ports/unix/Makefile | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/examples/usercmodule/cppexample/micropython.mk b/examples/usercmodule/cppexample/micropython.mk index e10d965a00..0071d4fcc7 100644 --- a/examples/usercmodule/cppexample/micropython.mk +++ b/examples/usercmodule/cppexample/micropython.mk @@ -6,7 +6,7 @@ SRC_USERMOD_CXX += $(CPPEXAMPLE_MOD_DIR)/example.cpp # Add our module directory to the include path. CFLAGS_USERMOD += -I$(CPPEXAMPLE_MOD_DIR) -CXXFLAGS_USERMOD += -I$(CPPEXAMPLE_MOD_DIR) +CXXFLAGS_USERMOD += -I$(CPPEXAMPLE_MOD_DIR) -std=c++11 # We use C++ features so have to link against the standard library. LDFLAGS_USERMOD += -lstdc++ diff --git a/ports/unix/Makefile b/ports/unix/Makefile index cd8bb379c4..7732211e2d 100644 --- a/ports/unix/Makefile +++ b/ports/unix/Makefile @@ -270,12 +270,6 @@ CFLAGS += -DMPZ_DIG_SIZE=16 # force 16 bits to work on both 32 and 64 bit archs CFLAGS += -DMICROPY_MODULE_FROZEN_STR endif -HASCPP17 = $(shell expr `$(CC) -dumpversion | cut -f1 -d.` \>= 7) -ifeq ($(HASCPP17), 1) - CXXFLAGS += -std=c++17 -else - CXXFLAGS += -std=c++11 -endif CXXFLAGS += $(filter-out -Wmissing-prototypes -Wold-style-definition -std=gnu99,$(CFLAGS) $(CXXFLAGS_MOD)) ifeq ($(MICROPY_FORCE_32BIT),1) |