diff options
| author | Pedro Giffuni <pfg@apache.org> | 2015-03-26 22:31:35 +0000 |
|---|---|---|
| committer | Pedro Giffuni <pfg@apache.org> | 2015-03-26 22:31:35 +0000 |
| commit | 775929fdc096ef7224919dffddae722cf7ce4558 (patch) | |
| tree | 68cd51cd6609b42390d8c33aecd1311c2421339c /solenv/inc | |
| parent | b6bfecc5b622e7af89515ad9e669c6f939d3b917 (diff) | |
FreeBSD build structure changes
Part of
Code Review: https://reviews.freebsd.org/D2108
Author: Don Lewis (truckman at FreeBSD)
Notes
Notes:
prefer: b9ef67fbba706029d9c61ff858f8e05fa42d61ad
Diffstat (limited to 'solenv/inc')
| -rw-r--r-- | solenv/inc/unxfbsd.mk | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/solenv/inc/unxfbsd.mk b/solenv/inc/unxfbsd.mk index c77128240485..a9d946bc5b62 100644 --- a/solenv/inc/unxfbsd.mk +++ b/solenv/inc/unxfbsd.mk @@ -27,7 +27,7 @@ ASM= AFLAGS= SOLAR_JAVA*= -PICSWITCH*:=-fpic +PICSWITCH*:=-fPIC JAVAFLAGSDEBUG=-g # Include arch specific makefile. @@ -49,7 +49,7 @@ JAVAFLAGSDEBUG=-g #LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter" # _PTHREADS is needed for the stl -CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450 +CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450 -DHAVE_STL_INCLUDE_PATH # enable visibility define in "sal/types.h" .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" @@ -88,7 +88,7 @@ CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta # flags for the C++ Compiler CFLAGSCC= -pipe $(ARCH_FLAGS) # Flags for enabling exception handling -CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs +CFLAGSEXCEPTIONS=-fexceptions # Flags for disabling exception handling CFLAGS_NO_EXCEPTIONS=-fno-exceptions @@ -156,7 +156,7 @@ LINKFLAGSRUNPATH_OXT= LINKFLAGSRUNPATH_BOXT=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN'\' #LINKFLAGSRUNPATH_BOXT=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\' LINKFLAGSRUNPATH_NONE= -LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE) +LINKFLAGS=-Wl,-z,combreloc $(LDFLAGS) $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE) # linker flags for linking applications LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \ @@ -199,11 +199,11 @@ STDSHLCUIMT+=-ltcmalloc .ENDIF # libraries for linking applications -STDLIBGUIMT+=-Wl,--as-needed $(PTHREAD_LIBS) -lm -Wl,--no-as-needed -STDLIBCUIMT+=-Wl,--as-needed $(PTHREAD_LIBS) -lm -Wl,--no-as-needed +STDLIBGUIMT+=-Wl,--as-needed $(PTHREAD_LIBS) -lm -Wl,--no-as-needed ${FBSD_LDFLAGS} +STDLIBCUIMT+=-Wl,--as-needed $(PTHREAD_LIBS) -lm -Wl,--no-as-needed ${FBSD_LDFLAGS} # libraries for linking shared libraries -STDSHLGUIMT+=-Wl,--as-needed $(PTHREAD_LIBS) -lm -Wl,--no-as-needed -STDSHLCUIMT+=-Wl,--as-needed $(PTHREAD_LIBS) -lm -Wl,--no-as-needed +STDSHLGUIMT+=-Wl,--as-needed $(PTHREAD_LIBS) -lm -Wl,--no-as-needed ${FBSD_LDFLAGS} +STDSHLCUIMT+=-Wl,--as-needed $(PTHREAD_LIBS) -lm -Wl,--no-as-needed ${FBSD_LDFLAGS} X11LINK_DYNAMIC = -Wl,--as-needed -lXext -lX11 -Wl,--no-as-needed |