git://git.uio.no
/
u
/
mrichter
/
AliRoot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changes needed on Linux with ICC
[u/mrichter/AliRoot.git]
/
build
/
module.tpl
diff --git
a/build/module.tpl
b/build/module.tpl
index f8a18358003b8af1729485b4bfe8b81ebbd1a4ad..6147f79e0c4778731cb1ed345115c310bd4b47e3 100644
(file)
--- a/
build/module.tpl
+++ b/
build/module.tpl
@@
-18,6
+18,16
@@
else
@PACKAGE@CXXFLAGS:=$(PACKCXXFLAGS)
endif
@PACKAGE@CXXFLAGS:=$(PACKCXXFLAGS)
endif
+ifndef PACKDCXXFLAGS
+ifeq ($(PLATFORM),linuxicc)
+@PACKAGE@DCXXFLAGS:=$(filter-out -O%,$(CXXFLAGS)) -O0
+else
+@PACKAGE@DCXXFLAGS:=$(filter-out -O%,$(CXXFLAGS))
+endif
+else
+@PACKAGE@DCXXFLAGS:=$(PACKCXXFLAGS)
+endif
+
ifdef DHDR
WITHDICT=YES
ifdef DHDR
WITHDICT=YES
@@
-143,12
+153,12
@@
endif
$(SHLD) $(SOFLAGS) $(@PACKAGE@ELIBSDIR) $(@PACKAGE@ELIBS) -o $(CURDIR)/$@ $(notdir $(@PACKAGE@O) $(@PACKAGE@DO)) $(SHLIB) ;\
cd $(CURDIR) ; rm -rf $$TMPDIR
$(MUTE)chmod a-w $@
$(SHLD) $(SOFLAGS) $(@PACKAGE@ELIBSDIR) $(@PACKAGE@ELIBS) -o $(CURDIR)/$@ $(notdir $(@PACKAGE@O) $(@PACKAGE@DO)) $(SHLIB) ;\
cd $(CURDIR) ; rm -rf $$TMPDIR
$(MUTE)chmod a-w $@
-
+
$(@PACKAGE@BIN):$(@PACKAGE@O) $(@PACKAGE@DO) @MODULE@/module.mk
ifndef ALIQUIET
@echo "***** Making executable $@ *****"
endif
$(@PACKAGE@BIN):$(@PACKAGE@O) $(@PACKAGE@DO) @MODULE@/module.mk
ifndef ALIQUIET
@echo "***** Making executable $@ *****"
endif
- $(MUTE)$(LD) $(LDFLAGS) $(@PACKAGE@O) $(@PACKAGE@DO) $(BINLIBDIRS) $(
LIBS) $(@PACKAGE@E
LIBS) $(EXEFLAGS) -o $@
+ $(MUTE)$(LD) $(LDFLAGS) $(@PACKAGE@O) $(@PACKAGE@DO) $(BINLIBDIRS) $(
@PACKAGE@ELIBS) $(
LIBS) $(EXEFLAGS) -o $@
$(@PACKAGE@DS): $(@PACKAGE@CINTHDRS) $(@PACKAGE@DH) @MODULE@/module.mk
ifndef ALIQUIET
$(@PACKAGE@DS): $(@PACKAGE@CINTHDRS) $(@PACKAGE@DH) @MODULE@/module.mk
ifndef ALIQUIET
@@
-161,7
+171,7
@@
$(@PACKAGE@DO): $(@PACKAGE@DS)
ifndef ALIQUIET
@echo "***** Compiling $< *****";
endif
ifndef ALIQUIET
@echo "***** Compiling $< *****";
endif
- $(MUTE)$(CXX) -c $(@PACKAGE@INC) -I$(ALICE_ROOT) $< -o $@ $(@PACKAGE@CXXFLAGS)
+ $(MUTE)$(CXX) -c $(@PACKAGE@INC) -I$(ALICE_ROOT) $< -o $@ $(@PACKAGE@
D
CXXFLAGS)
#Different targets for the module
#Different targets for the module