Mercurial > hg > truffle

comparison make/bsd/makefiles/gcc.make @ 14716:03704aa6e71b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Christian Humer <christian.humer@gmail.com>
date Fri, 21 Mar 2014 13:54:43 +0100
parents b51e29501f30
children 92aa6797d639
comparison
equal deleted inserted replaced
14715:4ea4db3f23ba 14716:03704aa6e71b
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
343 # Flags for generating make dependency flags. 335 # Flags for generating make dependency flags.
344 DEPFLAGS = -MMD -MP -MF $(DEP_DIR)/$(@:%=%.d) 336 DEPFLAGS = -MMD -MP -MF $(DEP_DIR)/$(@:%=%.d)
345 ifeq ($(USE_CLANG),) 337 ifeq ($(USE_CLANG),)
346 ifneq ($(CC_VER_MAJOR), 2) 338 ifneq ($(CC_VER_MAJOR), 2)
347 DEPFLAGS += -fpch-deps 339 DEPFLAGS += -fpch-deps
377 #------------------------------------------------------------------------ 369 #------------------------------------------------------------------------
378 # Linker flags 370 # Linker flags
379 371
380 # statically link libstdc++.so, work with gcc but ignored by g++ 372 # statically link libstdc++.so, work with gcc but ignored by g++
381 STATIC_STDCXX = -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic 373 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
382 379
383 ifeq ($(USE_CLANG),) 380 ifeq ($(USE_CLANG),)
384 # statically link libgcc and/or libgcc_s, libgcc does not exist before gcc-3.x. 381 # statically link libgcc and/or libgcc_s, libgcc does not exist before gcc-3.x.
385 ifneq ("${CC_VER_MAJOR}", "2") 382 ifneq ("${CC_VER_MAJOR}", "2")
386 STATIC_LIBGCC += -static-libgcc 383 STATIC_LIBGCC += -static-libgcc