Changes in uspace/Makefile.common [82d9087:5a50430] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/Makefile.common
r82d9087 r5a50430 35 35 # DEFS compiler defines 36 36 # EXTRA_CFLAGS additional flags to pass to C compiler 37 # LINKER_SCRIPT linker script 37 38 # PRE_DEPEND targets required for dependency check 38 39 # … … 152 153 BASE_LIBS += $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a $(LIBSOFTINT_PREFIX)/libsoftint.a 153 154 154 ifneq ($(LINK_DYNAMIC),y) 155 ifeq ($(LINK_DYNAMIC),y) 156 LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld 157 else 155 158 LDFLAGS += -static 156 endif 159 LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld 160 endif 161 162 LIB_LINKER_SCRIPT = $(LIBC_PREFIX)/arch/$(UARCH)/_link-shlib.ld 157 163 158 164 INCLUDES_FLAGS = $(LIBC_INCLUDES_FLAGS) … … 255 261 endif 256 262 257 COMMON_CXXFLAGS = $(COMMON_CFLAGS) -fno-exceptions263 COMMON_CXXFLAGS = $(COMMON_CFLAGS) 258 264 HELENOS_CXXFLAGS = \ 259 265 -std=c++17 -frtti \ … … 345 351 346 352 ifneq ($(filter %.cpp %.cc %.cxx, $(SOURCES)),) 347 $(BINARY): $( OBJECTS) $(LIBTAGS)348 $(CXX) $(CXXFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) - Wl,-Map,$@.map -o $@ $(START_FILES) $(OBJECTS) $(LIBARGS) $(CXX_BASE_LIBS)349 else 350 $(BINARY): $( OBJECTS) $(LIBTAGS)351 $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) - Wl,-Map,$@.map -o $@ $(START_FILES) $(OBJECTS) $(LIBARGS) $(BASE_LIBS)353 $(BINARY): $(LINKER_SCRIPT) $(OBJECTS) $(LIBTAGS) 354 $(CXX) $(CXXFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) -T $(LINKER_SCRIPT) -Wl,-Map,$@.map -o $@ $(START_FILES) $(OBJECTS) $(LIBARGS) $(CXX_BASE_LIBS) 355 else 356 $(BINARY): $(LINKER_SCRIPT) $(OBJECTS) $(LIBTAGS) 357 $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) -T $(LINKER_SCRIPT) -Wl,-Map,$@.map -o $@ $(START_FILES) $(OBJECTS) $(LIBARGS) $(BASE_LIBS) 352 358 endif 353 359 … … 355 361 356 362 ifneq ($(TEST_BINARY),) 357 $(TEST_BINARY): $( TEST_OBJECTS) $(TEST_BINARY_LIBS) $(LIBTAGS)358 $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) - Wl,-Map,$@.map -o $@ $(START_FILES) $(TEST_OBJECTS) $(TEST_BINARY_LIBS) $(LIBARGS) $(BASE_LIBS)363 $(TEST_BINARY): $(LINKER_SCRIPT) $(TEST_OBJECTS) $(TEST_BINARY_LIBS) $(LIBTAGS) 364 $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) -T $(LINKER_SCRIPT) -Wl,-Map,$@.map -o $@ $(START_FILES) $(TEST_OBJECTS) $(TEST_BINARY_LIBS) $(LIBARGS) $(BASE_LIBS) 359 365 endif 360 366 … … 372 378 $(AR) rc $@ $(LOBJECTS) 373 379 374 $(SLIBRARY): $(LIB RARY).la375 $(CC) $(CFLAGS) $(LIB_LDFLAGS) $(EXTRA_LDFLAGS) - Wl,-Map,$@.map -o $@ -Wl,--whole-archive $(LIBRARY).la -Wl,--no-whole-archive $(LIBARGS) $(BASE_LIBS)380 $(SLIBRARY): $(LIB_LINKER_SCRIPT) $(LIBRARY).la 381 $(CC) $(CFLAGS) $(LIB_LDFLAGS) $(EXTRA_LDFLAGS) -T $(LIB_LINKER_SCRIPT) -Wl,-Map,$@.map -o $@ -Wl,--whole-archive $(LIBRARY).la -Wl,--no-whole-archive $(LIBARGS) $(BASE_LIBS) 376 382 377 383 $(LSONAME):
Note:
See TracChangeset
for help on using the changeset viewer.