|
|
|
|
--- work.orig/makefile 2011-11-09 22:40:30.000000000 -0500
|
|
|
|
|
+++ work/makefile 2011-11-16 19:24:24.615419949 -0500
|
|
|
|
|
@@ -435,9 +435,6 @@
|
|
|
|
|
CPPONLYFLAGS += -x c++ -std=gnu++98
|
|
|
|
|
COBJFLAGS += -x objective-c++
|
|
|
|
|
|
|
|
|
|
-# this speeds it up a bit by piping between the preprocessor/compiler/assembler
|
|
|
|
|
-CCOMFLAGS += -pipe
|
|
|
|
|
-
|
|
|
|
|
# add -g if we need symbols, and ensure we have frame pointers
|
|
|
|
|
ifdef SYMBOLS
|
|
|
|
|
CCOMFLAGS += -g$(SYMLEVEL) -fno-omit-frame-pointer
|
|
|
|
|
@@ -442,7 +442,6 @@
|
|
|
|
|
|
|
|
|
|
# add -v if we need verbose build information
|
|
|
|
|
ifdef VERBOSE
|
|
|
|
|
-CCOMFLAGS += -v
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
# add profiling information for the compiler
|
|
|
|
|
@@ -453,23 +450,6 @@
|
|
|
|
|
CCOMFLAGS += -pg
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
-# add the optimization flag
|
|
|
|
|
-CCOMFLAGS += -O$(OPTIMIZE)
|
|
|
|
|
-
|
|
|
|
|
-# if we are optimizing, include optimization options
|
|
|
|
|
-# and make all errors into warnings
|
|
|
|
|
-ifneq ($(OPTIMIZE),0)
|
|
|
|
|
-ifneq ($(TARGETOS),os2)
|
|
|
|
|
-ifndef NOWERROR
|
|
|
|
|
-CCOMFLAGS += -Werror -fno-strict-aliasing $(ARCHOPTS)
|
|
|
|
|
-else
|
|
|
|
|
-CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)
|
|
|
|
|
-endif
|
|
|
|
|
-else
|
|
|
|
|
-CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)
|
|
|
|
|
-endif
|
|
|
|
|
-endif
|
|
|
|
|
-
|
|
|
|
|
# add a basic set of warnings
|
|
|
|
|
CCOMFLAGS += \
|
|
|
|
|
-Wall \
|
|
|
|
|
@@ -524,20 +504,6 @@
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
-#-------------------------------------------------
|
|
|
|
|
-# linking flags
|
|
|
|
|
-#-------------------------------------------------
|
|
|
|
|
-
|
|
|
|
|
-# LDFLAGS are used generally; LDFLAGSEMULATOR are additional
|
|
|
|
|
-# flags only used when linking the core emulator
|
|
|
|
|
-LDFLAGS =
|
|
|
|
|
-ifneq ($(TARGETOS),macosx)
|
|
|
|
|
-ifneq ($(TARGETOS),os2)
|
|
|
|
|
-ifneq ($(TARGETOS),solaris)
|
|
|
|
|
-LDFLAGS = -Wl,--warn-common
|
|
|
|
|
-endif
|
|
|
|
|
-endif
|
|
|
|
|
-endif
|
|
|
|
|
LDFLAGSEMULATOR =
|
|
|
|
|
|
|
|
|
|
# add profiling information for the linker
|
|
|
|
|
@@ -545,13 +511,6 @@
|
|
|
|
|
LDFLAGS += -pg
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
-# strip symbols and other metadata in non-symbols and non profiling builds
|
|
|
|
|
-ifndef SYMBOLS
|
|
|
|
|
-ifneq ($(TARGETOS),macosx)
|
|
|
|
|
-LDFLAGS += -s
|
|
|
|
|
-endif
|
|
|
|
|
-endif
|
|
|
|
|
-
|
|
|
|
|
# output a map file (emulator only)
|
|
|
|
|
ifdef MAP
|
|
|
|
|
LDFLAGSEMULATOR += -Wl,-Map,$(FULLNAME).map
|
