From feae1e11597f6b69ff6b91865f41eebbcb0348e3 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 10 Oct 2014 19:44:01 +0000 Subject: [PATCH] move the -std=c++0x upper --- debian/rules | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/rules b/debian/rules index 08bfa9e7..eaa63d19 100755 --- a/debian/rules +++ b/debian/rules @@ -22,9 +22,9 @@ DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH) OCAML_STDLIB_DIR ?= $(shell ocamlc -where) -LDFLAGS_EXTRA= -CXXFLAGS_EXTRA= -CONFIGURE_EXTRA= +LDFLAGS_EXTRA = +CXXFLAGS_EXTRA = -std=c++0x +CONFIGURE_EXTRA = ifneq (,$(filter $(DEB_HOST_ARCH),powerpc powerpcspe)) LDFLAGS_EXTRA += -latomic @@ -218,7 +218,7 @@ override_dh_auto_configure: preconfigure override_dh_auto_build: - $(PRE_PROCESS) $(MAKE) $(NJOBS) -C $(TARGET_BUILD) VERBOSE=1 CLANG_VENDOR=$(VENDOR) CXXFLAGS="$(CXXFLAGS_EXTRA) -std=c++0x" LDFLAGS="$(LDFLAGS_EXTRA)" REQUIRES_RTTI=1 DEBUGMAKE=1 + $(PRE_PROCESS) $(MAKE) $(NJOBS) -C $(TARGET_BUILD) VERBOSE=1 CLANG_VENDOR=$(VENDOR) CXXFLAGS="$(CXXFLAGS_EXTRA)" LDFLAGS="$(LDFLAGS_EXTRA)" REQUIRES_RTTI=1 DEBUGMAKE=1 # We run the build with the Asserts, new directory, make a symlink to make # sure the rest still work