Changes in uspace/Makefile.common [00d7e1b:e8c5c11] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/Makefile.common
r00d7e1b re8c5c11 44 44 # EXTRA_CLEAN additional cleanup targets 45 45 # 46 # POSIX_COMPAT set to 'y' to use POSIX compatibility layer47 #48 46 # Optionally, for a binary: 49 47 # STATIC_NEEDED set to 'y' for init binaries, will build statically … … 106 104 LIBSOFTINT_PREFIX = $(LIB_PREFIX)/softint 107 105 108 LIBPOSIX_PREFIX = $(LIB_PREFIX)/posix109 110 106 LIBBLOCK_PREFIX = $(LIB_PREFIX)/block 111 107 LIBFS_PREFIX = $(LIB_PREFIX)/fs 112 LIBFB_PREFIX = $(LIB_PREFIX)/fb113 108 LIBCLUI_PREFIX = $(LIB_PREFIX)/clui 114 LIBFMTUTIL_PREFIX = $(LIB_PREFIX)/fmtutil115 116 LIBEXT2_PREFIX = $(LIB_PREFIX)/ext2117 118 LIBUSB_PREFIX = $(LIB_PREFIX)/usb119 LIBUSBHOST_PREFIX = $(LIB_PREFIX)/usbhost120 LIBUSBDEV_PREFIX = $(LIB_PREFIX)/usbdev121 LIBUSBHID_PREFIX = $(LIB_PREFIX)/usbhid122 LIBUSBVIRT_PREFIX = $(LIB_PREFIX)/usbvirt123 109 124 110 LIBDRV_PREFIX = $(LIB_PREFIX)/drv 111 LIBPACKET_PREFIX = $(LIB_PREFIX)/packet 125 112 LIBNET_PREFIX = $(LIB_PREFIX)/net 126 LIBNIC_PREFIX = $(LIB_PREFIX)/nic127 LIBMINIX_PREFIX = $(LIB_PREFIX)/minix128 129 LIBSCSI_PREFIX = $(LIB_PREFIX)/scsi130 113 131 114 ifeq ($(STATIC_NEEDED),y) … … 143 126 endif 144 127 145 # Build static whenever we use libusb because that library uses146 # thread local variables147 ifneq ($(findstring usb, $(LIBS)),)148 STATIC_BUILD = y149 endif150 151 128 ifeq ($(STATIC_BUILD), y) 152 129 BASE_LIBS = $(LIBC_PREFIX)/libc.a $(LIBSOFTINT_PREFIX)/libsoftint.a … … 220 197 JOBFILE = $(LIBC_PREFIX)/../../../tools/jobfile.py 221 198 222 ifeq ($(POSIX_COMPAT),y)223 CFLAGS = -I$(LIBPOSIX_PREFIX)224 LIBS += $(LIBPOSIX_PREFIX)/libposix.a225 endif226 227 199 ifeq ($(COMPILER),gcc_cross) 228 CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS)200 CFLAGS = $(GCC_CFLAGS) $(EXTRA_CFLAGS) 229 201 DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS) 230 202 endif 231 203 232 204 ifeq ($(COMPILER),gcc_native) 233 CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS)205 CFLAGS = $(GCC_CFLAGS) $(EXTRA_CFLAGS) 234 206 DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS) 235 207 endif 236 208 237 209 ifeq ($(COMPILER),icc) 238 CFLAGS += $(ICC_CFLAGS) $(EXTRA_CFLAGS)210 CFLAGS = $(ICC_CFLAGS) $(EXTRA_CFLAGS) 239 211 DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS) 240 212 endif 241 213 242 214 ifeq ($(COMPILER),clang) 243 CFLAGS += $(CLANG_CFLAGS) $(EXTRA_CFLAGS)215 CFLAGS = $(CLANG_CFLAGS) $(EXTRA_CFLAGS) 244 216 DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS) 245 217 endif
Note:
See TracChangeset
for help on using the changeset viewer.