Fix ibmcxx-clang build.sh flags. Account for ibmcxx-clang already def…

…ining unix macro.
bfgroup · Jan 31, 2025 · db458da · db458da
1 parent f667777
commit db458da
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/engine/build.sh b/src/engine/build.sh
@@ -341,8 +341,8 @@ case "${B2_TOOLSET}" in
     ;;
 
     ibmcxx-clang)
-        CXX_VERSION_OPT=${CXX_VERSION_OPT:--qversion}
-        B2_CXXFLAGS_RELEASE="-O3 -s -Wno-deprecated-declarations"
+        CXX_VERSION_OPT=${CXX_VERSION_OPT:---version}
+        B2_CXXFLAGS_RELEASE="-O3 -Wl,-s -Wno-deprecated-declarations"
         B2_CXXFLAGS_DEBUG="-O0 -fno-inline -g -Wno-deprecated-declarations"
     ;;
 

diff --git a/src/engine/jam.h b/src/engine/jam.h
@@ -147,7 +147,9 @@
 #define PATH_DELIM '/'
 
 #ifdef _AIX
+    #ifndef unix
     #define unix
+    #endif
     #define MAXLINE 23552  /* 24k - 1k, max chars per command line */
     #define OSMINOR "OS=AIX"
     #define OS_AIX