Changeset 73401643 in mainline for uspace/Makefile.common
- Timestamp:
- 2018-07-05T21:41:25Z (6 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 8054f60
- Parents:
- 5b12dbb
- git-author:
- Dzejrou <dzejrou@…> (2018-07-02 20:27:35)
- git-committer:
- Dzejrou <dzejrou@…> (2018-07-05 21:41:25)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/Makefile.common
r5b12dbb r73401643 79 79 OUTPUTS += $(BINARY) $(BINARY).disasm 80 80 EXTRA_CLEAN += $(BINARY).map 81 endif82 83 ifneq ($(CXX_BINARY),)84 JOB = $(CXX_BINARY).job85 TEST_BINARY = test-$(CXX_BINARY)86 OUTPUTS += $(CXX_BINARY) $(CXX_BINARY).disasm87 EXTRA_CLEAN += $(CXX_BINARY).map88 81 endif 89 82 … … 245 238 # Flags for the compilation of C++ code. 246 239 CXX_BASE_LIBS = $(LIBCPP_PREFIX)/libcpp.a $(BASE_LIBS) 247 CXXFLAGS = $(LIBCPP_INCLUDES_FLAGS) $(INCLUDES_FLAGS) -O$(OPTIMIZATION) $(COMMON_CFLAGS) \ 240 DEFAULT_CXXFLAGS = \ 241 -O$(OPTIMIZATION) \ 242 -ffunction-sections \ 243 -pipe \ 244 -Wall \ 245 -Wextra \ 246 -Wno-unused-parameter \ 247 -Wwrite-strings \ 248 -Werror-implicit-function-declaration 249 250 COMMON_CXXFLAGS = $(COMMON_CFLAGS) 251 HELENOS_CXXFLAGS = \ 252 -std=c++17 -frtti \ 253 $(LIBCPP_INCLUDES_FLAGS) $(INCLUDES_FLAGS) \ 248 254 -imacros $(CONFIG_HEADER) \ 249 -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \ 250 -finput-charset=UTF-8 -ffreestanding -fno-builtin -ffunction-sections \ 251 -nostdlib -nostdinc -Wall -Wextra -Wno-clobbered -Wno-unused-parameter \ 252 -std=c++17 -Werror-implicit-function-declaration \ 253 -Wwrite-strings -pipe -ggdb -D__$(ENDIANESS)__ 255 -D_HELENOS_SOURCE \ 256 -fexec-charset=UTF-8 \ 257 -finput-charset=UTF-8 \ 258 -fno-common \ 259 -fdebug-prefix-map=$(realpath $(ROOT_PATH))=. 260 261 CXXFLAGS = $(COMMON_CPPFLAGS) $(COMMON_CXXFLAGS) $(HELENOS_CXXFLAGS) $(DEFAULT_CXXFLAGS) 254 262 255 263 ## Setup platform configuration … … 326 334 327 335 ifneq ($(BINARY),) 336 337 ifeq ($(findstring ".cpp", $($suffix $(SOURCES))),) 338 $(BINARY): $(LINKER_SCRIPT) $(OBJECTS) $(LIBTAGS) $(CXX_BASE_LIBS) 339 $(CXX) $(CXXFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) -T $(LINKER_SCRIPT) -Wl,-Map,$@.map -o $@ $(OBJECTS) $(LIBARGS) $(CXX_BASE_LIBS) 340 else 328 341 $(BINARY): $(LINKER_SCRIPT) $(OBJECTS) $(LIBTAGS) $(BASE_LIBS) 329 342 $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) -T $(LINKER_SCRIPT) -Wl,-Map,$@.map -o $@ $(OBJECTS) $(LIBARGS) $(BASE_LIBS) 330 343 endif 331 344 332 ifneq ($(CXX_BINARY),)333 $(CXX_BINARY): $(LINKER_SCRIPT) $(OBJECTS) $(LIBTAGS) $(CXX_BASE_LIBS)334 $(CXX) $(CXXFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) -T $(LINKER_SCRIPT) -Wl,-Map,$@.map -o $@ $(OBJECTS) $(LIBARGS) $(CXX_BASE_LIBS)335 345 endif 336 346
Note:
See TracChangeset
for help on using the changeset viewer.