From e5de1a11607dd49932dbbf3dd6b8f4e2ad89e7bc Mon Sep 17 00:00:00 2001 From: Vladimir Prus Date: Wed, 21 Jan 2009 19:37:33 +0000 Subject: [PATCH] Make cflags/cxxflags/linkflags work with intel-linux [SVN r50708] --- src/tools/intel-linux.jam | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tools/intel-linux.jam b/src/tools/intel-linux.jam index b69a6c8a6..66897e412 100644 --- a/src/tools/intel-linux.jam +++ b/src/tools/intel-linux.jam @@ -91,7 +91,7 @@ rule compile.c++ ( targets * : sources * : properties * ) actions compile.c++ { - "$(CONFIG_COMMAND)" -c -xc++ $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)" + "$(CONFIG_COMMAND)" -c -xc++ $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)" } rule compile.c ( targets * : sources * : properties * ) @@ -102,7 +102,7 @@ rule compile.c ( targets * : sources * : properties * ) actions compile.c { - "$(CONFIG_COMMAND)" -c -xc $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)" + "$(CONFIG_COMMAND)" -c -xc $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)" } rule link ( targets * : sources * : properties * ) @@ -114,7 +114,7 @@ rule link ( targets * : sources * : properties * ) actions link bind LIBRARIES { - "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,-R$(SPACE)-Wl,"$(RPATH)" -Wl,-rpath-link$(SPACE)-Wl,"$(RPATH_LINK)" -o "$(<)" "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST) $(OPTIONS) + "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,-R$(SPACE)-Wl,"$(RPATH)" -Wl,-rpath-link$(SPACE)-Wl,"$(RPATH_LINK)" -o "$(<)" "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST) $(OPTIONS) $(USER_OPTIONS) } rule link.dll ( targets * : sources * : properties * )