comparison make/bsd/makefiles/gcc.make @ 14726:92aa6797d639

Backed out merge changeset: b51e29501f30 Backed out merge revision to its first parent (8f483e200405)
author Doug Simon <doug.simon@oracle.com>
date Mon, 24 Mar 2014 21:30:43 +0100
parents b51e29501f30
children
comparison
equal deleted inserted replaced
14719:0bdd0d157040 14726:92aa6797d639
330 ifeq ($(shell expr $(CC_VER_MAJOR) = 4 \& $(CC_VER_MINOR) = 3), 1) 330 ifeq ($(shell expr $(CC_VER_MAJOR) = 4 \& $(CC_VER_MINOR) = 3), 1)
331 OPT_CFLAGS/mulnode.o += $(OPT_CFLAGS/NOOPT) 331 OPT_CFLAGS/mulnode.o += $(OPT_CFLAGS/NOOPT)
332 endif 332 endif
333 endif 333 endif
334 334
335 # We want to use libc++ on Clang 5.0
336 ifeq ($(USE_CLANG), true)
337 # Clang 5.0
338 ifeq ($(shell expr $(CC_VER_MAJOR) = 5 \& \( $(CC_VER_MINOR) = 0 \| $(CC_VER_MINOR) = 1 \) ), 1)
339 CFLAGS += -stdlib=libc++
340 endif
341 endif
342
335 # Flags for generating make dependency flags. 343 # Flags for generating make dependency flags.
336 DEPFLAGS = -MMD -MP -MF $(DEP_DIR)/$(@:%=%.d) 344 DEPFLAGS = -MMD -MP -MF $(DEP_DIR)/$(@:%=%.d)
337 ifeq ($(USE_CLANG),) 345 ifeq ($(USE_CLANG),)
338 ifneq ($(CC_VER_MAJOR), 2) 346 ifneq ($(CC_VER_MAJOR), 2)
339 DEPFLAGS += -fpch-deps 347 DEPFLAGS += -fpch-deps
369 #------------------------------------------------------------------------ 377 #------------------------------------------------------------------------
370 # Linker flags 378 # Linker flags
371 379
372 # statically link libstdc++.so, work with gcc but ignored by g++ 380 # statically link libstdc++.so, work with gcc but ignored by g++
373 STATIC_STDCXX = -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic 381 STATIC_STDCXX = -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic
374
375 # Ensure use libstdc++ on clang, not libc++
376 ifeq ($(USE_CLANG), true)
377 LFLAGS += -stdlib=libstdc++
378 endif
379 382
380 ifeq ($(USE_CLANG),) 383 ifeq ($(USE_CLANG),)
381 # statically link libgcc and/or libgcc_s, libgcc does not exist before gcc-3.x. 384 # statically link libgcc and/or libgcc_s, libgcc does not exist before gcc-3.x.
382 ifneq ("${CC_VER_MAJOR}", "2") 385 ifneq ("${CC_VER_MAJOR}", "2")
383 STATIC_LIBGCC += -static-libgcc 386 STATIC_LIBGCC += -static-libgcc