Only define ARCHFLAGS on Darwin systems.
This commit is contained in:
parent
c9b67f4f20
commit
d4b660e68a
1 changed files with 6 additions and 7 deletions
13
acprep
13
acprep
|
|
@ -39,13 +39,13 @@ INCDIRS="$INCDIRS -isystem /opt/local/include/libofx"
|
||||||
INCDIRS="$INCDIRS -isystem /usr/local/include/boost-1_35"
|
INCDIRS="$INCDIRS -isystem /usr/local/include/boost-1_35"
|
||||||
INCDIRS="$INCDIRS -isystem $PYTHON_HOME/include/python$PYTHON_VERSION"
|
INCDIRS="$INCDIRS -isystem $PYTHON_HOME/include/python$PYTHON_VERSION"
|
||||||
|
|
||||||
|
CXXFLAGS=""
|
||||||
|
ARCHFLAGS=""
|
||||||
|
LDARCHFLAGS=""
|
||||||
LDFLAGS=""
|
LDFLAGS=""
|
||||||
LIBDIRS="-L/usr/local/lib -L/opt/local/lib"
|
LIBDIRS="-L/usr/local/lib -L/opt/local/lib"
|
||||||
LIBDIRS="$LIBDIRS -L$PYTHON_HOME/lib/python$PYTHON_VERSION/config"
|
LIBDIRS="$LIBDIRS -L$PYTHON_HOME/lib/python$PYTHON_VERSION/config"
|
||||||
|
|
||||||
ARCHFLAGS="-arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk"
|
|
||||||
|
|
||||||
|
|
||||||
SYSTEM=$(uname -s)
|
SYSTEM=$(uname -s)
|
||||||
|
|
||||||
if [ $SYSTEM = Linux ]; then
|
if [ $SYSTEM = Linux ]; then
|
||||||
|
|
@ -53,9 +53,8 @@ if [ $SYSTEM = Linux ]; then
|
||||||
elif [ $SYSTEM = Solaris ]; then
|
elif [ $SYSTEM = Solaris ]; then
|
||||||
CXXFLAGS="-pthreads"
|
CXXFLAGS="-pthreads"
|
||||||
elif [ $SYSTEM = Darwin ]; then
|
elif [ $SYSTEM = Darwin ]; then
|
||||||
CXXFLAGS=""
|
ARCHFLAGS="-arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk"
|
||||||
else
|
LDARCHFLAGS="$ARCHFLAGS -Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk"
|
||||||
CXXFLAGS=""
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Building the command-line tool as a shared library is a luxury,
|
# Building the command-line tool as a shared library is a luxury,
|
||||||
|
|
@ -259,7 +258,7 @@ while [ -n "$1" ]; do
|
||||||
SWITCHES="$SWITCHES --disable-dependency-tracking"
|
SWITCHES="$SWITCHES --disable-dependency-tracking"
|
||||||
CPPFLAGS="-isystem /usr/local/stow/cppunit/include $CPPFLAGS"
|
CPPFLAGS="-isystem /usr/local/stow/cppunit/include $CPPFLAGS"
|
||||||
CXXFLAGS="$CXXFLAGS $ARCHFLAGS"
|
CXXFLAGS="$CXXFLAGS $ARCHFLAGS"
|
||||||
LDFLAGS="$LDFLAGS $ARCHFLAGS -Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk"
|
LDFLAGS="$LDFLAGS $LDARCHFLAGS"
|
||||||
LDFLAGS="-L/usr/local/stow/cppunit/lib $LDFLAGS"
|
LDFLAGS="-L/usr/local/stow/cppunit/lib $LDFLAGS"
|
||||||
|
|
||||||
shift 1 ;;
|
shift 1 ;;
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue